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

Commit 027ffd9d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not execute face auth when notification" into qt-r1-dev

parents 32bf7415 a422c09e

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

+2 −3
Original line number Diff line number Diff line
@@ -3947,9 +3947,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
                mStatusBarWindow.suppressWakeUpGesture(true);

            }



            boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_NOTIFICATION || (

                    reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN

                            && mWakeLockScreenPerformsAuth);

            boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN

                            && mWakeLockScreenPerformsAuth;

            // 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

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

    public void testPulseWhileDozing_notifyAuthInterrupt() {

        HashSet<Integer> reasonsWantingAuth = new HashSet<>(

                Collections.singletonList(DozeLog.PULSE_REASON_NOTIFICATION));

                Collections.singletonList(DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN));

        HashSet<Integer> reasonsSkippingAuth = new HashSet<>(

                Arrays.asList(DozeLog.PULSE_REASON_INTENT,

                        DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,

                        DozeLog.PULSE_REASON_NOTIFICATION,

                        DozeLog.PULSE_REASON_SENSOR_SIGMOTION,

                        DozeLog.REASON_SENSOR_PICKUP,

                        DozeLog.REASON_SENSOR_DOUBLE_TAP,
@@ -661,6 +661,7 @@ public class StatusBarTest extends SysuiTestCase { 
            return null;

        }).when(mDozeScrimController).pulse(any(), anyInt());



        mStatusBar.mDozeServiceHost.mWakeLockScreenPerformsAuth = true;

        for (int i = 0; i < DozeLog.REASONS; i++) {

            reset(mKeyguardUpdateMonitor);

            mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), i);