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

Merge "Require shortcut to bubble" into rvc-dev

Browse Source
This commit is contained in:
Mady Mellor
2020-06-01 16:29:53 +00:00
committed by Android (Google) Code Review
parent eadf939db8 6ce11e7400
commit 1dbf98fb57
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,7 @@ public class BubbleExtractor implements NotificationSignalExtractor {
boolean canPresentAsBubble = canPresentAsBubble(record)
&& !mActivityManager.isLowRamDevice()
&& record.isConversation()
&& record.getShortcutInfo() != null
&& (record.getNotification().flags & FLAG_FOREGROUND_SERVICE) == 0;
if (!mConfig.bubblesEnabled()

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

@@ -430,6 +430,25 @@ public class BubbleExtractorTest extends UiServiceTestCase {
assertFalse(r.getNotification().isBubbleNotification());
}
@Test
public void testFlagBubble_false_noShortcut() {
setUpBubblesEnabled(true /* feature */,
BUBBLE_PREFERENCE_ALL /* app */,
DEFAULT_ALLOW_BUBBLE /* channel */);
when(mActivityManager.isLowRamDevice()).thenReturn(false);
setUpIntentBubble(true /* isValid */);
NotificationRecord r = getNotificationRecord(true /* bubble */);
r.setShortcutInfo(null);
r.getNotification().extras.putString(Notification.EXTRA_TEMPLATE, null);
mBubbleExtractor.process(r);
assertFalse(r.canBubble());
assertNull(r.getNotification().getBubbleMetadata());
assertFalse(r.getNotification().isBubbleNotification());
}
@Test
public void testFlagBubble_false_notConversation() {
setUpBubblesEnabled(true /* feature */,
@@ -439,8 +458,7 @@ public class BubbleExtractorTest extends UiServiceTestCase {
setUpIntentBubble(true /* isValid */);
NotificationRecord r = getNotificationRecord(true /* bubble */);
// No longer a conversation:
r.setShortcutInfo(null);
r.userDemotedAppFromConvoSpace(true);
r.getNotification().extras.putString(Notification.EXTRA_TEMPLATE, null);
mBubbleExtractor.process(r);

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

@@ -5308,6 +5308,28 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
nr.getSbn().getKey()).getNotification().isBubbleNotification());
}
@Test
public void testFlagBubbleNotifs_noFlag_noShortcut() throws RemoteException {
setUpPrefsForBubbles(PKG, mUid,
true /* global */,
BUBBLE_PREFERENCE_ALL /* app */,
true /* channel */);
Notification.Builder nb = getMessageStyleNotifBuilder(true, null, false);
nb.setShortcutId(null);
StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1,
null, mUid, 0,
nb.build(), new UserHandle(mUid), null, 0);
mBinderService.enqueueNotificationWithTag(PKG, PKG, sbn.getTag(),
sbn.getId(), sbn.getNotification(), sbn.getUserId());
waitForIdle();
// no shortcut no bubble
assertFalse(mService.getNotificationRecord(
sbn.getKey()).getNotification().isBubbleNotification());
}
@Test
public void testFlagBubbleNotifs_noFlag_messaging_appNotAllowed() throws RemoteException {
setUpPrefsForBubbles(PKG, mUid,