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

Commit 8c624b80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add flagRemoved check back in BubbleExtractor" into rvc-dev

parents 3bc73c27 e6749c16

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

+3 −1
Original line number Diff line number Diff line
@@ -94,7 +94,9 @@ public class BubbleExtractor implements NotificationSignalExtractor { 
                && record.isConversation()

                && !mActivityManager.isLowRamDevice()

                && (record.getNotification().flags & FLAG_FOREGROUND_SERVICE) == 0;

        final boolean applyFlag = fulfillsPolicy && canPresentAsBubble(record);

        final boolean applyFlag = fulfillsPolicy

                && canPresentAsBubble(record)

                && !record.isFlagBubbleRemoved();

        if (applyFlag) {

            record.getNotification().flags |= FLAG_BUBBLE;

        } else {

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

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ public class BubbleExtractorTest extends UiServiceTestCase { 
                BUBBLE_PREFERENCE_ALL /* app */,

                true /* channel */);

        when(mActivityManager.isLowRamDevice()).thenReturn(false);

        setUpShortcutBubble(true /* isValid */);



        NotificationRecord r = getNotificationRecord(true /* bubble */);

        r.setFlagBubbleRemoved(true);