Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97299da0 authored by Alexander Roederer's avatar Alexander Roederer
Browse files

Add FLAG_ONLY_ALERT_ONCE to direct reply update 

Adds FLAG_ONLY_ALERT_ONCE to the update we sent from system_server to
systemUI on direct reply, to transition the notification out of the
sending state and to the sent state.

This update should only be used to update the appearance of the
notification; it should not alert, because it's triggered by the user's
direct reply action, and the user already knows they direct replied
(they're the ones who did it). We already setPostSilently on the
notification record, but that just prevents beeping, buzzing, and
blinking; it doesn't prevent the notification from HUN-ing if, for
example, the enqueued update somehow gets re-triggered by the app (see
attached bug).

Modified unit tests to check we're adding this flag.

Bug: 335106917
Test: atest NotificationManagerServiceTest
Flag: ACONFIG android.app.lifetime_extension_refactor STAGING
Change-Id: I521d83eea27e7026e1050a27856ef86013fd659f
parent 759538ca

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -11271,6 +11271,9 @@ public class NotificationManagerService extends SystemService { 














            // Lifetime extended notifications don't need to alert on state change.















            record.setPostSilently(true);













            // We also set FLAG_ONLY_ALERT_ONCE to avoid the notification from HUN-ing again.













            record.getNotification().flags |= FLAG_ONLY_ALERT_ONCE;



























            mHandler.post(new EnqueueNotificationRunnable(record.getUser().getIdentifier(),















                    record, isAppForeground,















                    mPostNotificationTrackerFactory.newTracker(null)));

































services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -5969,6 +5969,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        assertThat(captor.getValue().getNotification().flags















                & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo(















                FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY);













        assertThat(captor.getValue().getNotification().flags













                & FLAG_ONLY_ALERT_ONCE).isEqualTo(FLAG_ONLY_ALERT_ONCE);















        assertThat(captor.getValue().shouldPostSilently()).isTrue();















    }
























@@ -8798,6 +8800,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        assertThat(captor.getValue().getNotification().flags















                & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo(















                FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY);













        assertThat(captor.getValue().getNotification().flags













                & FLAG_ONLY_ALERT_ONCE).isEqualTo(FLAG_ONLY_ALERT_ONCE);















        assertThat(captor.getValue().shouldPostSilently()).isTrue();















    }