Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e15ef48 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Missed call LED pulse notification is... missing" am: 1c628333 am:... 

Merge "Missed call LED pulse notification is... missing" am: 1c628333 am: bdc34933 am: d9b13056

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458399

Change-Id: I5d2bc5e82d76ab6eaf58ebb7bfc19a3729e86d16
parents 54b570ea d9b13056

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -7169,15 +7169,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;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
        NotificationRecord r = getLightsNotification();

        mService.buzzBeepBlinkLocked(r);

        verifyNeverLights();

        assertFalse(r.isInterruptive());

        assertTrue(r.isInterruptive());

        assertEquals(-1, r.getLastAudiblyAlertedMs());

    }