Collect, persist and transport ANR ApplicationExitInfo

firebase-crashlytics/firebase-crashlytics.gradle

@@ -26,10 +26,11 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    compileSdkVersion 30
+    testOptions.unitTests.includeAndroidResources = true
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion project.targetSdkVersion
+        targetSdkVersion 30
         versionName version
 
         multiDexEnabled true
@@ -74,7 +75,8 @@ dependencies {
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
 
     testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation "org.robolectric:robolectric:4.5"
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.3.3'
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java

@@ -14,7 +14,16 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -208,7 +217,7 @@ public void testWriteNonFatal_callsSessionReportingCoordinatorPersistNonFatal()
         .thenReturn(Arrays.asList(sessionId));
 
     controller.writeNonFatalException(thread, nonFatal);
-    controller.doCloseSessions();
+    controller.doCloseSessions(testSettingsDataProvider);
 
     verify(mockSessionReportingCoordinator)
         .persistNonFatalEvent(eq(nonFatal), eq(thread), eq(sessionId), anyLong());
@@ -305,7 +314,7 @@ public File getOsFile() {
             .setLogFileManager(logFileManager)
             .build();
 
-    controller.finalizeSessions();
+    controller.finalizeSessions(testSettingsDataProvider);
 
     final File[] nativeDirectories = controller.listNativeSessionFileDirectories();
 
@@ -319,7 +328,7 @@ public File getOsFile() {
 
   public void testMissingNativeComponentCausesNoReports() {
     final CrashlyticsController controller = createController();
-    controller.finalizeSessions();
+    controller.finalizeSessions(testSettingsDataProvider);
 
     final File[] sessionFiles = controller.listNativeSessionFileDirectories();
 
@@ -365,7 +374,7 @@ public void testFinalizeSessionAfterCrashOk() throws Exception {
         testSettingsDataProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
-    controller.finalizeSessions();
+    controller.finalizeSessions(testSettingsDataProvider);
   }
 
   public void testUploadWithNoReports() throws Exception {
@@ -529,7 +538,7 @@ public void testFatalEvent_sendsAppExceptionEvent() {
     controller.openSession();
     controller.handleUncaughtException(
         testSettingsDataProvider, Thread.currentThread(), new RuntimeException("Fatal"));
-    controller.finalizeSessions();
+    controller.finalizeSessions(testSettingsDataProvider);
 
     assertFirebaseAnalyticsCrashEvent(mockFirebaseAnalyticsLogger);
   }

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java

@@ -668,6 +668,36 @@ public void testPersistEvent_whenSettingsChanges_keepsAppropriateNumberOfMostRec
         finalizedReport2);
   }
 
+  @Test
+  public void testPersistAppExitInfo() throws IOException {
+    reportPersistence =
+        new CrashlyticsReportPersistence(
+            folder.newFolder(), getSettingsMock(VERY_LARGE_UPPER_LIMIT, 4));
+    final String sessionId = "testSession";
+    final CrashlyticsReport testReport = makeTestReport(sessionId);
+    final CrashlyticsReport.Session.Event testEvent1 = makeTestEvent("anr", "reason1");
+    final CrashlyticsReport.ApplicationExitInfo testAppExitInfo = makeAppExitInfo();
+
+    reportPersistence.persistReport(testReport);
+    reportPersistence.persistAppExitInfoEvent(testEvent1, sessionId, testAppExitInfo);
+
+    final long endedAt = System.currentTimeMillis();
+
+    reportPersistence.finalizeReports("skippedSession", endedAt);
+
+    final List<CrashlyticsReportWithSessionId> finalizedReports =
+        reportPersistence.loadFinalizedReports();
+    assertEquals(1, finalizedReports.size());
+    final CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
+    assertEquals(1, finalizedReport.getSession().getEvents().size());
+    assertEquals(
+        testReport
+            .withSessionEndFields(endedAt, true, null)
+            .withEvents(ImmutableList.from(testEvent1))
+            .withAppExitInfo(testAppExitInfo),
+        finalizedReport);
+  }
+
   private static void persistReportWithEvent(
       CrashlyticsReportPersistence reportPersistence, String sessionId, boolean isHighPriority) {
     CrashlyticsReport testReport = makeTestReport(sessionId);
@@ -743,7 +773,7 @@ private static Event makeTestEvent() {
 
   private static Event makeTestEvent(String type, String reason) {
     return Event.builder()
-        .setType("type")
+        .setType(type)
         .setTimestamp(1000)
         .setApp(
             Session.Event.Application.builder()
@@ -819,4 +849,14 @@ private static ImmutableList<Frame> makeTestFrames() {
             .setImportance(4)
             .build());
   }
+
+  private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
+    return CrashlyticsReport.ApplicationExitInfo.builder()
+        .setTraceFile("trace")
+        .setTimestamp(1L)
+        .setImportance(1)
+        .setReasonCode(1)
+        .setProcessName("test")
+        .build();
+  }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java

@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.firebase.crashlytics.internal.common;
 
+import android.app.ActivityManager;
+import android.app.ApplicationExitInfo;
 import android.content.Context;
 import android.os.Build;
 import android.os.Build.VERSION;
@@ -190,7 +192,7 @@ public Task<Void> call() throws Exception {
                     ex, thread, currentSessionId, timestampSeconds);
 
                 doWriteAppExceptionMarker(timestampMillis);
-                doCloseSessions();
+                doCloseSessions(settingsDataProvider);
                 doOpenSession();
 
                 // If automatic data collection is disabled, we'll need to wait until the next run
@@ -520,8 +522,10 @@ private String getCurrentSessionId() {
    *
    * <p>This method can not be called while the {@link CrashlyticsCore} settings lock is held. It
    * will result in a deadlock!
+   *
+   * @param settingsDataProvider
    */
-  boolean finalizeSessions() {
+  boolean finalizeSessions(SettingsDataProvider settingsDataProvider) {
     backgroundWorker.checkRunningOnThread();
 
     if (isHandlingException()) {
@@ -531,7 +535,7 @@ boolean finalizeSessions() {
 
     Logger.getLogger().v("Finalizing previously open sessions.");
     try {
-      doCloseSessions(true);
+      doCloseSessions(true, settingsDataProvider);
     } catch (Exception e) {
       Logger.getLogger().e("Unable to finalize previously open sessions.", e);
       return false;
@@ -562,15 +566,16 @@ private void doOpenSession() {
     reportingCoordinator.onBeginSession(sessionIdentifier, startedAtSeconds);
   }
 
-  void doCloseSessions() {
-    doCloseSessions(false);
+  void doCloseSessions(SettingsDataProvider settingsDataProvider) {
+    doCloseSessions(false, settingsDataProvider);
   }
 
   /**
    * Not synchronized/locked. Must be executed from the single thread executor service used by this
    * class.
    */
-  private void doCloseSessions(boolean skipCurrentSession) {
+  private void doCloseSessions(
+      boolean skipCurrentSession, SettingsDataProvider settingsDataProvider) {
     final int offset = skipCurrentSession ? 1 : 0;
 
     List<String> sortedOpenSessions = reportingCoordinator.listSortedOpenSessionIds();
@@ -582,6 +587,12 @@ private void doCloseSessions(boolean skipCurrentSession) {
 
     final String mostRecentSessionIdToClose = sortedOpenSessions.get(offset);
 
+    if (settingsDataProvider.getSettings().getFeaturesData().collectAnrs) {
+      // TODO: Consider writing applicationExitInfo for all sessions instead of just the most recent
+      // sessionId to close.
+      writeApplicationExitInfoEventIfRelevant(mostRecentSessionIdToClose);
+    }
+
     if (nativeComponent.hasCrashDataForSession(mostRecentSessionIdToClose)) {
       // We only finalize the current session if it's a Java crash, so only finalize native crash
       // data when we aren't including current.
@@ -856,4 +867,23 @@ static List<NativeSessionFile> getNativeSessionFiles(
   }
 
   // endregion
+
+  // region ApplicationExitInfo
+
+  /** If an ApplicationExitInfo exists relevant to the session, writes that event. */
+  private void writeApplicationExitInfoEventIfRelevant(String sessionId) {
+    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      ActivityManager activityManager =
+          (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+      List<ApplicationExitInfo> applicationExitInfoList =
+          activityManager.getHistoricalProcessExitReasons(null, 0, 0);
+
+      // Passes the latest applicationExitInfo to ReportCoordinator, which persists it if it
+      // happened during the session.
+      if (applicationExitInfoList.size() != 0) {
+        reportingCoordinator.persistAppExitInfoEvent(sessionId, applicationExitInfoList.get(0));
+      }
+    }
+  }
+  // endregion
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java

@@ -228,7 +228,7 @@ private Task<Void> doBackgroundInitialization(SettingsDataProvider settingsProvi
             new RuntimeException("Collection of crash reports disabled in Crashlytics settings."));
       }
 
-      if (!controller.finalizeSessions()) {
+      if (!controller.finalizeSessions(settingsProvider)) {
         Logger.getLogger().w("Previous sessions could not be finalized.");
       }