Merge main into fix-reporting-pii-mainthread

2026-07-04 02:26:50 -05:00
parent 64f4c64936 b95ae2e7eb
commit 5e2d65d91a
5 changed files with 139 additions and 10 deletions
@@ -66,4 +66,16 @@ class PushStatusNotificationInstrumentedTest {
            notification.extras.getCharSequence(Notification.EXTRA_TEXT).toString(),
        )
    }
+
+    @Test
+    fun build_afterDataSyncFgsTimeout_saysInstantDeliveryPaused() {
+        // The dataSync FGS runtime-cap fallback (#302): the timed-out text takes precedence over the
+        // mode the service was in when the platform fired onTimeout (still IDLE at that point).
+        val notification = PushStatusNotification.build(context, PushMode.IDLE, timedOut = true)
+
+        assertEquals(
+            context.getString(R.string.notif_push_status_text_timed_out),
+            notification.extras.getCharSequence(Notification.EXTRA_TEXT).toString(),
+        )
+    }
 }