diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 179118c0e9391..91276203934ab 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -6964,15 +6964,15 @@ public class NotificationManagerService extends SystemService { if (record.getSbn().isGroup() && record.getNotification().suppressAlertingDueToGrouping()) { return false; } - // not if in call or the screen's on - if (isInCall() || mScreenOn) { + // not if in call + if (isInCall()) { return false; } // check current user if (!isNotificationForCurrentUser(record)) { return false; } - + // Light, but only when the screen is off return true; } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java index abcc14c6be93f..078832d33a76d 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -1185,7 +1185,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { NotificationRecord r = getLightsNotification(); mService.buzzBeepBlinkLocked(r); verifyNeverLights(); - assertFalse(r.isInterruptive()); + assertTrue(r.isInterruptive()); assertEquals(-1, r.getLastAudiblyAlertedMs()); }