Log notification open after onActivityCreated() on Android 7.0 and earlier. (#3432)

#3090

* Switched to log notification open after onActivityCreated() has completed on Android 7.0 and earlier since unparceling a Bundle is not thread safe on those versions. This may help to avoid a race condition with anything else that may be trying to access the Intent extra Bundle from another thread started in onActivityCreated()/onCreate().

Author: gsakakihara

firebase-messaging/src/main/java/com/google/firebase/messaging/FcmLifecycleCallbacks.java

@@ -16,7 +16,11 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -35,12 +39,14 @@ public void onActivityCreated(Activity createdActivity, Bundle instanceState) {
       return;
     }
 
-    Bundle extras = startingIntent.getExtras();
-    if (extras != null) {
-      Bundle analyticsData = extras.getBundle(Constants.MessageNotificationKeys.ANALYTICS_DATA);
-      if (MessagingAnalytics.shouldUploadScionMetrics(analyticsData)) {
-        MessagingAnalytics.logNotificationOpen(analyticsData);
-      }
+    if (VERSION.SDK_INT <= VERSION_CODES.N) {
+      // On Android 7.0 and lower Bundle unparceling is not thread safe. Wait to log notification
+      // open after Activity.onCreate() has completed to try to avoid race conditions with other
+      // code that may be trying to access the Intent extras Bundle in onCreate() on a different
+      // thread.
+      new Handler(Looper.getMainLooper()).post(() -> logNotificationOpen(startingIntent));
+    } else {
+      logNotificationOpen(startingIntent);
     }
   }
 
@@ -66,4 +72,14 @@ public void onActivityResumed(Activity activity) {}
 
   @Override
   public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {}
+
+  private void logNotificationOpen(Intent startingIntent) {
+    Bundle extras = startingIntent.getExtras();
+    if (extras != null) {
+      Bundle analyticsData = extras.getBundle(Constants.MessageNotificationKeys.ANALYTICS_DATA);
+      if (MessagingAnalytics.shouldUploadScionMetrics(analyticsData)) {
+        MessagingAnalytics.logNotificationOpen(analyticsData);
+      }
+    }
+  }
 }