Merge "Do not execute face auth when notification" into qt-r1-dev (a24c2286) · Commits · e / os / android_frameworks_base

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

+2 −3

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

	boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_NOTIFICATION \|\| (		boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN
	reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN		&& mWakeLockScreenPerformsAuth;
	&& mWakeLockScreenPerformsAuth);
	// Set the state to pulsing, so ScrimController will know what to do once we ask it to		// 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		// 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.		// 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	Original line	Diff line number	Diff line
	@@ -640,10 +640,10 @@ public class StatusBarTest extends SysuiTestCase {
	@Test		@Test
	public void testPulseWhileDozing_notifyAuthInterrupt() {		public void testPulseWhileDozing_notifyAuthInterrupt() {
	HashSet<Integer> reasonsWantingAuth = new HashSet<>(		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<>(		HashSet<Integer> reasonsSkippingAuth = new HashSet<>(
	Arrays.asList(DozeLog.PULSE_REASON_INTENT,		Arrays.asList(DozeLog.PULSE_REASON_INTENT,
	DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,		DozeLog.PULSE_REASON_NOTIFICATION,
	DozeLog.PULSE_REASON_SENSOR_SIGMOTION,		DozeLog.PULSE_REASON_SENSOR_SIGMOTION,
	DozeLog.REASON_SENSOR_PICKUP,		DozeLog.REASON_SENSOR_PICKUP,
	DozeLog.REASON_SENSOR_DOUBLE_TAP,		DozeLog.REASON_SENSOR_DOUBLE_TAP,
	@@ -662,6 +662,7 @@ public class StatusBarTest extends SysuiTestCase {
	return null;		return null;
	}).when(mDozeScrimController).pulse(any(), anyInt());		}).when(mDozeScrimController).pulse(any(), anyInt());

			mStatusBar.mDozeServiceHost.mWakeLockScreenPerformsAuth = true;
	for (int i = 0; i < DozeLog.REASONS; i++) {		for (int i = 0; i < DozeLog.REASONS; i++) {
	reset(mKeyguardUpdateMonitor);		reset(mKeyguardUpdateMonitor);
	mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), i);		mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), i);