Merge pull request #2235 from bugsnag/PLAT-14598/exitinfo-avoid-unmatched

ExitInfo Plugin: Avoid synthesizing duplicate ANRs when in fallback modes

Author: lemnik

CHANGELOG.md

@@ -7,6 +7,11 @@
 * `memoryTrimLevel` and `lowMemory` will not be reported when they are not set (newer versions of Android do not set these values)
   [#2237](https://github.com/bugsnag/bugsnag-android/pull/2237)
 
+### Bug fixes
+
+* Handle edge-cases to reduce the changes of duplicate ANR reporting from `bugsnag-plugin-android-exitinfo` when `reportUnmatchedANR = true && disableProcessStateSummaryOverride = true`
+  [#2235](https://github.com/bugsnag/bugsnag-android/pull/2235)
+
 ## 6.16.0 (2025-07-31)
 
 ### Changes

bugsnag-plugin-android-exitinfo/detekt-baseline.xml

@@ -2,12 +2,11 @@
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
-    <ID>CyclomaticComplexMethod:CodeStrings.kt$@RequiresApi(Build.VERSION_CODES.R) @SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") internal fun importanceDescriptionOf(exitInfo: ApplicationExitInfo)</ID>
-    <ID>CyclomaticComplexMethod:CodeStrings.kt$@RequiresApi(Build.VERSION_CODES.R) internal fun exitReasonOf(exitInfo: ApplicationExitInfo)</ID>
+    <ID>CyclomaticComplexMethod:CodeDescriptions.kt$@RequiresApi(Build.VERSION_CODES.R) @SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") internal fun importanceDescriptionOf(exitInfo: ApplicationExitInfo)</ID>
+    <ID>CyclomaticComplexMethod:CodeDescriptions.kt$@RequiresApi(Build.VERSION_CODES.R) internal fun exitReasonOf(exitInfo: ApplicationExitInfo)</ID>
     <ID>LongParameterList:TombstoneParser.kt$TombstoneParser$( exitInfo: ApplicationExitInfo, listOpenFds: Boolean, includeLogcat: Boolean, threadConsumer: (BugsnagThread) -> Unit, fileDescriptorConsumer: (Int, String, String) -> Unit, logcatConsumer: (String) -> Unit )</ID>
     <ID>MagicNumber:TraceParser.kt$TraceParser$16</ID>
     <ID>MagicNumber:TraceParser.kt$TraceParser$3</ID>
-    <ID>MaxLineLength:ExitInfoCallbackTest.kt$ExitInfoCallbackTest$exitInfoCallback = ExitInfoCallback(context, nativeEnhancer, anrEventEnhancer, null, ApplicationExitInfoMatcher(context, 100))</ID>
     <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so "</ID>
     <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so (Java_com_example_bugsnag_android_BaseCrashyActivity_anrFromCXX+20"</ID>
     <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so (Java_com_example_bugsnag_android_BaseCrashyActivity_anrFromCXX+20) ("</ID>

bugsnag-plugin-android-exitinfo/src/androidTest/java/com/bugsnag/android/BugsnagExitInfoPluginStoreTest.kt

@@ -0,0 +1,63 @@
+package com.bugsnag.android
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.mock
+import java.io.File
+
+class ExitInfoPluginStoreTest {
+    private lateinit var storeFile: File
+
+    @Before
+    fun setUp() {
+        storeFile = File.createTempFile("bugsnag-exit-reasons", null)
+    }
+
+    @After
+    fun tearDown() {
+        storeFile.delete()
+    }
+
+    @Test
+    fun testStoreInitialization() {
+        val store = ExitInfoPluginStore(storeFile, mock())
+
+        // Verify that the store initializes correctly
+        assert(store.previousState == null)
+        assert(store.currentState.processedExitInfoKeys.isEmpty())
+        assert(store.currentState.pid == android.os.Process.myPid())
+        assert(store.currentState.timestamp > 0)
+    }
+
+    @Test
+    fun testParsesLegacyFile() {
+        storeFile.writeText("1234567890")
+        val store = ExitInfoPluginStore(storeFile, mock())
+
+        assertEquals(1234567890, store.previousState?.pid)
+        assertEquals(true, store.previousState?.processedExitInfoKeys?.isEmpty())
+    }
+
+    @Test
+    fun testPersistsExitInfoKeys() {
+        val store = ExitInfoPluginStore(storeFile, mock())
+        store.addExitInfoKey(ExitInfoKey(1234, 1234567890L))
+        store.addExitInfoKey(ExitInfoKey(5678, 1234567891L))
+
+        val restoredStore = ExitInfoPluginStore(storeFile, mock())
+        assertEquals(2, restoredStore.previousState?.processedExitInfoKeys?.size)
+        val previousState = restoredStore.previousState
+        assertNotNull(previousState)
+        assertEquals(
+            true,
+            previousState?.processedExitInfoKeys?.contains(ExitInfoKey(1234, 1234567890L))
+        )
+        assertEquals(
+            true,
+            previousState?.processedExitInfoKeys?.contains(ExitInfoKey(5678, 1234567891L))
+        )
+    }
+}

bugsnag-plugin-android-exitinfo/src/androidTest/java/com/bugsnag/android/ExitInfoPluginStoreTest.kt

@@ -1,27 +1,18 @@
 package com.bugsnag.android
 
-import android.app.ActivityManager
 import android.app.ApplicationExitInfo
-import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 
 @RequiresApi(Build.VERSION_CODES.R)
 internal class ApplicationExitInfoMatcher(
-    private val context: Context,
-    private val pid: Int
+    private val applicationExitInfo: List<ApplicationExitInfo>,
+    private val previousState: ExitInfoPluginStore.PersistentState? = null,
 ) {
     fun matchExitInfo(event: Event): ApplicationExitInfo? {
-        val am: ActivityManager =
-            context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-        val allExitInfo: List<ApplicationExitInfo> =
-            am.getHistoricalProcessExitReasons(context.packageName, MATCH_ALL, MAX_EXIT_INFO)
-        val sessionIdBytes: ByteArray =
-            event.session?.id?.toByteArray() ?: return null
-        val exitInfo: ApplicationExitInfo =
-            findExitInfoBySessionId(allExitInfo, sessionIdBytes)
-                ?: findExitInfoByPid(allExitInfo) ?: return null
-        return exitInfo
+        val sessionIdBytes: ByteArray = event.session?.id?.toByteArray() ?: return null
+        return findExitInfoBySessionId(applicationExitInfo, sessionIdBytes)
+            ?: findExitInfoByPid(applicationExitInfo)
     }
 
     internal fun findExitInfoBySessionId(
@@ -32,7 +23,7 @@ internal class ApplicationExitInfoMatcher(
     }
 
     internal fun findExitInfoByPid(allExitInfo: List<ApplicationExitInfo>) =
-        allExitInfo.find { it.pid == pid }
+        allExitInfo.find { it.pid == previousState?.pid }
 
     internal companion object {
         const val MATCH_ALL = 0