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

Commit 93c3afad authored by Julia Tuttle's avatar Julia Tuttle
Browse files

NotificationInterruptStateProvider: suppress peek/pulse when app suspended 

If an app is suspended in focus mode, we should suppress peek and pulse;
otherwise, the notifications may *immediately* peek or pulse when focus
mode ends.

Modify the old NotificationInterruptStateProvider to suppress
interruptions from suspended apps in canAlertCommon (which covers peek,
pulse, and bubble) instead of just shouldBubbleUp.

Note that, despite touching code in the visual interruptions refactor,
this change is *not* related to or flagged by the refactor's feature
flag; this is a long-standing omission in our interruption logic, not a
bug in the refactored code.

Bug: 329620290
Flag: NA
Test: atest NotificationInterruptStateProviderWrapperTest
Change-Id: Icbe9bcbb4ccba4870e42ee51f244cf2e15e095ed
parent 8c0a2a1a

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptLogger.kt

+2 −2
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ class NotificationInterruptLogger @Inject constructor( 
        }

    }



    fun logSuspendedAppBubble(entry: NotificationEntry) {

    fun logNoAlertingAppSuspended(entry: NotificationEntry) {

        buffer.log(TAG, DEBUG, {

            str1 = entry.logKey

        }, {

            "No bubble up: notification: app $str1 is suspended"

            "No alerting: app is suspended: $str1"

        })

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+7 −5
Original line number Diff line number Diff line
@@ -204,11 +204,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            return false;

        }



        if (entry.getRanking().isSuspended()) {

            mLogger.logSuspendedAppBubble(entry);

            return false;

        }



        if (entry.getBubbleMetadata() == null

                || (entry.getBubbleMetadata().getShortcutId() == null

                    && entry.getBubbleMetadata().getIntent() == null)) {
@@ -559,6 +554,13 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            }

        }



        if (entry.getRanking().isSuspended()) {

            if (log) {

                mLogger.logNoAlertingAppSuspended(entry);

            }

            return false;

        }



        if (mKeyguardNotificationVisibilityProvider.shouldHideNotification(entry)) {

            if (log) mLogger.logNoAlertingNotificationHidden(entry);

            return false;