For example, you might want to use this constant if you post a number of children + * notifications at once (say, after a periodic sync), and only need to notify the user + * audibly once. + */ + public static final int GROUP_ALERT_SUMMARY = 1; + + /** + * Constant for {@link Builder#setGroupAlertBehavior(int)}, meaning that the summary + * notification in a group should be silenced (no sound or vibration) even if they are + * posted to a {@link NotificationChannel} that has sound and/or vibration. Use this constant + * to mute this notification if this notification is a group summary. + * + *
For example, you might want to use this constant if only the children notifications + * in your group have content and the summary is only used to visually group notifications. + */ + public static final int GROUP_ALERT_CHILDREN = 2; + + private int mGroupAlertBehavior = GROUP_ALERT_ALL; + /** * If this notification is being shown as a badge, always show as a number. */ @@ -1878,6 +1917,8 @@ public class Notification implements Parcelable if (parcel.readInt() != 0) { mSettingsText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel); } + + mGroupAlertBehavior = parcel.readInt(); } @Override @@ -1990,6 +2031,7 @@ public class Notification implements Parcelable that.mShortcutId = this.mShortcutId; that.mBadgeIcon = this.mBadgeIcon; that.mSettingsText = this.mSettingsText; + that.mGroupAlertBehavior = this.mGroupAlertBehavior; if (!heavy) { that.lightenPayload(); // will clean out extras @@ -2266,6 +2308,8 @@ public class Notification implements Parcelable } else { parcel.writeInt(0); } + + parcel.writeInt(mGroupAlertBehavior); } /** @@ -2470,17 +2514,6 @@ public class Notification implements Parcelable return mTimeout; } - /** - * @removed - * Returns what icon should be shown for this notification if it is being displayed in a - * Launcher that supports badging. Will be one of {@link #BADGE_ICON_NONE}, - * {@link #BADGE_ICON_SMALL}, or {@link #BADGE_ICON_LARGE}. - */ - @Deprecated - public int getBadgeIcon() { - return mBadgeIcon; - } - /** * Returns what icon should be shown for this notification if it is being displayed in a * Launcher that supports badging. Will be one of {@link #BADGE_ICON_NONE}, @@ -2505,6 +2538,15 @@ public class Notification implements Parcelable return mSettingsText; } + /** + * Returns which type of notifications in a group are responsible for audibly alerting the + * user. See {@link #GROUP_ALERT_ALL}, {@link #GROUP_ALERT_CHILDREN}, + * {@link #GROUP_ALERT_SUMMARY}. + */ + public @GroupAlertBehavior int getGroupAlertBehavior() { + return mGroupAlertBehavior; + } + /** * The small icon representing this notification in the status bar and content view. * @@ -2752,6 +2794,19 @@ public class Notification implements Parcelable return this; } + /** + * Sets the group alert behavior for this notification. Use this method to mute this + * notification if alerts for this notification's group should be handled by a different + * notification. This is only applicable for notifications that belong to a + * {@link #setGroup(String) group}. + * + *
The default value is {@link #GROUP_ALERT_ALL}.
+ */ + public Builder setGroupAlertBehavior(@GroupAlertBehavior int groupAlertBehavior) { + mN.mGroupAlertBehavior = groupAlertBehavior; + return this; + } + /** * Specifies the channel the notification should be delivered on. */ diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 02b93a232bb19..1e7d076267825 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -3659,10 +3659,7 @@ public class NotificationManagerService extends SystemService { } hasValidVibrate = vibration != null; - // We can alert, and we're allowed to alert, but if the developer asked us to only do - // it once, and we already have, then don't. - if (!(record.isUpdate - && (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0)) { + if (!shouldMuteNotificationLocked(record)) { sendAccessibilityEvent(notification, record.sbn.getPackageName()); if (hasValidSound) { @@ -3716,6 +3713,24 @@ public class NotificationManagerService extends SystemService { } } + boolean shouldMuteNotificationLocked(final NotificationRecord record) { + final Notification notification = record.getNotification(); + if(record.isUpdate + && (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0) { + return true; + } + if (record.sbn.isGroup()) { + if (notification.isGroupSummary() + && notification.getGroupAlertBehavior() == Notification.GROUP_ALERT_CHILDREN) { + return true; + } else if (notification.isGroupChild() + && notification.getGroupAlertBehavior() == Notification.GROUP_ALERT_SUMMARY) { + return true; + } + } + return false; + } + private boolean playSound(final NotificationRecord record, Uri soundUri) { boolean looping = (record.getNotification().flags & Notification.FLAG_INSISTENT) != 0; // do not play notifications if there is a user of exclusive audio focus diff --git a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java index 1106006352aaf..d4904f5aecf71 100644 --- a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -15,6 +15,9 @@ */ package com.android.server.notification; +import static android.app.Notification.GROUP_ALERT_ALL; +import static android.app.Notification.GROUP_ALERT_CHILDREN; +import static android.app.Notification.GROUP_ALERT_SUMMARY; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static junit.framework.Assert.assertFalse; @@ -188,17 +191,24 @@ public class BuzzBeepBlinkTest { private NotificationRecord getCustomLightsNotification() { return getNotificationRecord(mId, false /* insistent */, true /* once */, false /* noisy */, true /* buzzy*/, true /* lights */, - true /* defaultVibration */, true /* defaultSound */, false /* defaultLights */); + true /* defaultVibration */, true /* defaultSound */, false /* defaultLights */, + null, Notification.GROUP_ALERT_ALL); } private NotificationRecord getNotificationRecord(int id, boolean insistent, boolean once, boolean noisy, boolean buzzy, boolean lights) { - return getNotificationRecord(id, insistent, once, noisy, buzzy, lights, true, true, true); + return getNotificationRecord(id, insistent, once, noisy, buzzy, lights, true, true, true, + null, Notification.GROUP_ALERT_ALL); + } + + private NotificationRecord getBeepyNotificationRecord(String groupKey, int groupAlertBehavior) { + return getNotificationRecord(mId, false, false, true, false, false, true, true, true, + groupKey, groupAlertBehavior); } private NotificationRecord getNotificationRecord(int id, boolean insistent, boolean once, boolean noisy, boolean buzzy, boolean lights, boolean defaultVibration, - boolean defaultSound, boolean defaultLights) { + boolean defaultSound, boolean defaultLights, String groupKey, int groupAlertBehavior) { NotificationChannel channel = new NotificationChannel("test", "test", IMPORTANCE_HIGH); final Builder builder = new Builder(getContext()) @@ -239,6 +249,9 @@ public class BuzzBeepBlinkTest { } builder.setDefaults(defaults); + builder.setGroup(groupKey); + builder.setGroupAlertBehavior(groupAlertBehavior); + Notification n = builder.build(); if (insistent) { n.flags |= Notification.FLAG_INSISTENT; @@ -546,7 +559,7 @@ public class BuzzBeepBlinkTest { } @Test - public void testInsistenteVibrate() throws Exception { + public void testInsistentVibrate() throws Exception { NotificationRecord r = getInsistentBuzzyNotification(); mService.buzzBeepBlinkLocked(r); @@ -567,6 +580,71 @@ public class BuzzBeepBlinkTest { verifyVibrate(); } + @Test + public void testGroupAlertSummarySilenceChild() throws Exception { + NotificationRecord child = getBeepyNotificationRecord("a", GROUP_ALERT_SUMMARY); + + mService.buzzBeepBlinkLocked(child); + + verifyNeverBeep(); + } + + @Test + public void testGroupAlertSummaryNoSilenceSummary() throws Exception { + NotificationRecord summary = getBeepyNotificationRecord("a", GROUP_ALERT_SUMMARY); + summary.getNotification().flags |= Notification.FLAG_GROUP_SUMMARY; + + mService.buzzBeepBlinkLocked(summary); + + verifyBeepLooped(); + } + + @Test + public void testGroupAlertSummaryNoSilenceNonGroupChild() throws Exception { + NotificationRecord nonGroup = getBeepyNotificationRecord(null, GROUP_ALERT_SUMMARY); + + mService.buzzBeepBlinkLocked(nonGroup); + + verifyBeepLooped(); + } + + @Test + public void testGroupAlertChildSilenceSummary() throws Exception { + NotificationRecord summary = getBeepyNotificationRecord("a", GROUP_ALERT_CHILDREN); + summary.getNotification().flags |= Notification.FLAG_GROUP_SUMMARY; + + mService.buzzBeepBlinkLocked(summary); + + verifyNeverBeep(); + } + + @Test + public void testGroupAlertChildNoSilenceChild() throws Exception { + NotificationRecord child = getBeepyNotificationRecord("a", GROUP_ALERT_CHILDREN); + + mService.buzzBeepBlinkLocked(child); + + verifyBeepLooped(); + } + + @Test + public void testGroupAlertChildNoSilenceNonGroupSummary() throws Exception { + NotificationRecord nonGroup = getBeepyNotificationRecord(null, GROUP_ALERT_CHILDREN); + + mService.buzzBeepBlinkLocked(nonGroup); + + verifyBeepLooped(); + } + + @Test + public void testGroupAlertAllNoSilenceGroup() throws Exception { + NotificationRecord group = getBeepyNotificationRecord("a", GROUP_ALERT_ALL); + + mService.buzzBeepBlinkLocked(group); + + verifyBeepLooped(); + } + @Test public void testHonorAlertOnlyOnceForBuzz() throws Exception { NotificationRecord r = getBuzzyNotification();