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

Merge "If a bubble is updated to hide the notif, don't buzz"

Browse Source
This commit is contained in:
Mady Mellor
2020-11-20 15:30:11 +00:00
committed by Android (Google) Code Review
parent fd1ef729ab b896c38a77
commit 676369c4d4
2 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -7164,6 +7164,16 @@ public class NotificationManagerService extends SystemService {
return true;
}
// Suppressed since it's a non-interruptive update to a bubble-suppressed notification
final boolean isBubbleOrOverflowed = record.canBubble() && (record.isFlagBubbleRemoved()
|| record.getNotification().isBubbleNotification());
if (record.isUpdate && !record.isInterruptive() && isBubbleOrOverflowed
&& record.getNotification().getBubbleMetadata() != null) {
if (record.getNotification().getBubbleMetadata().isNotificationSuppressed()) {
return true;
}
}
return false;
}

75
services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java
View File

@@ -15,6 +15,7 @@
*/
package com.android.server.notification;
import static android.app.Notification.FLAG_BUBBLE;
import static android.app.Notification.GROUP_ALERT_ALL;
import static android.app.Notification.GROUP_ALERT_CHILDREN;
import static android.app.Notification.GROUP_ALERT_SUMMARY;
@@ -38,6 +39,7 @@ import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
@@ -50,9 +52,11 @@ import android.app.Notification;
import android.app.Notification.Builder;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.drawable.Icon;
import android.media.AudioAttributes;
import android.media.AudioManager;
import android.net.Uri;
@@ -1596,6 +1600,77 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase {
assertTrue(interrupter.isInterruptive());
}
@Test
public void testBubbleSuppressedNotificationDoesntMakeSound() {
Notification.BubbleMetadata metadata = new Notification.BubbleMetadata.Builder(
mock(PendingIntent.class), mock(Icon.class))
.build();
NotificationRecord record = getBuzzyNotification();
metadata.setFlags(Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION);
record.getNotification().setBubbleMetadata(metadata);
record.setAllowBubble(true);
record.getNotification().flags |= FLAG_BUBBLE;
record.isUpdate = true;
record.setInterruptive(false);
mService.buzzBeepBlinkLocked(record);
verifyNeverVibrate();
}
@Test
public void testOverflowBubbleSuppressedNotificationDoesntMakeSound() {
Notification.BubbleMetadata metadata = new Notification.BubbleMetadata.Builder(
mock(PendingIntent.class), mock(Icon.class))
.build();
NotificationRecord record = getBuzzyNotification();
metadata.setFlags(Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION);
record.getNotification().setBubbleMetadata(metadata);
record.setFlagBubbleRemoved(true);
record.setAllowBubble(true);
record.isUpdate = true;
record.setInterruptive(false);
mService.buzzBeepBlinkLocked(record);
verifyNeverVibrate();
}
@Test
public void testBubbleUpdateMakesSound() {
Notification.BubbleMetadata metadata = new Notification.BubbleMetadata.Builder(
mock(PendingIntent.class), mock(Icon.class))
.build();
NotificationRecord record = getBuzzyNotification();
record.getNotification().setBubbleMetadata(metadata);
record.setAllowBubble(true);
record.getNotification().flags |= FLAG_BUBBLE;
record.isUpdate = true;
record.setInterruptive(true);
mService.buzzBeepBlinkLocked(record);
verifyVibrate(1);
}
@Test
public void testNewBubbleSuppressedNotifMakesSound() {
Notification.BubbleMetadata metadata = new Notification.BubbleMetadata.Builder(
mock(PendingIntent.class), mock(Icon.class))
.build();
NotificationRecord record = getBuzzyNotification();
metadata.setFlags(Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION);
record.getNotification().setBubbleMetadata(metadata);
record.setAllowBubble(true);
record.getNotification().flags |= FLAG_BUBBLE;
record.isUpdate = false;
record.setInterruptive(true);
mService.buzzBeepBlinkLocked(record);
verifyVibrate(1);
}
static class VibrateRepeatMatcher implements ArgumentMatcher<VibrationEffect> {
private final int mRepeatIndex;