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

Commit f3d07377 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Only try to auth if there's a notification"

parents 30d08863 15fcb6d8

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -3881,7 +3881,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                return;

            }



            boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN;

            boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_NOTIFICATION;

            // Set the state to pulsing, so ScrimController will know what to do once we ask it to

            // execute the transition. The pulse callback will then be invoked when the scrims

            // are black, indicating that StatusBar is ready to present the rest of the UI.

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+2 −2
Original line number Diff line number Diff line
@@ -641,10 +641,10 @@ public class StatusBarTest extends SysuiTestCase { 
    @Test

    public void testPulseWhileDozing_notifyAuthInterrupt() {

        HashSet<Integer> reasonsWantingAuth = new HashSet<>(

                Collections.singletonList(DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN));

                Collections.singletonList(DozeLog.PULSE_REASON_NOTIFICATION));

        HashSet<Integer> reasonsSkippingAuth = new HashSet<>(

                Arrays.asList(DozeLog.PULSE_REASON_INTENT,

                        DozeLog.PULSE_REASON_NOTIFICATION,

                        DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,

                        DozeLog.PULSE_REASON_SENSOR_SIGMOTION,

                        DozeLog.REASON_SENSOR_PICKUP,

                        DozeLog.REASON_SENSOR_DOUBLE_TAP,