Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-24 01:07:08 +00:00
committed by Android (Google) Code Review
parent 3bc73c27c8 e6749c164f
commit 8c624b8001
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/BubbleExtractor.java
View File

@@ -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 {

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

@@ -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);