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

Commit 08bf4607 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Add a check at the global level for notification bubbles being enabled" into qt-dev 

am: b8e25308

Change-Id: Ic5f2caef44802e56e72c691da7dc90d1d4f80c95
parents e0c33809 b8e25308

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -4825,6 +4825,7 @@ public class NotificationManagerService extends SystemService { 
        // Does the app want to bubble & is able to bubble

        // Does the app want to bubble & is able to bubble

        boolean canBubble = notification.getBubbleMetadata() != null

        boolean canBubble = notification.getBubbleMetadata() != null

                && mPreferencesHelper.areBubblesAllowed(pkg, userId)

                && mPreferencesHelper.areBubblesAllowed(pkg, userId)

                && mPreferencesHelper.bubblesEnabled(r.sbn.getUser())

                && r.getChannel().canBubble()

                && r.getChannel().canBubble()

                && !mActivityManager.isLowRamDevice();

                && !mActivityManager.isLowRamDevice();

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

+59 −143

File changed.

Preview size limit exceeded, changes collapsed.