Merge "DO NOT MERGE: Delay brightness change" into pi-dev (5d8e53ce) · Commits · e / os / android_frameworks_base

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

+25 −8

Original line number	Diff line number	Diff line
		@@ -210,15 +210,28 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
		// until the clock and the notifications are faded out.
		mStatusBarWindowManager.setForceDozeBrightness(true);
		}
		// During wake and unlock, we need to draw black before waking up to avoid abrupt
		// brightness changes due to display state transitions.
		boolean alwaysOnEnabled = DozeParameters.getInstance(mContext).getAlwaysOn();
		boolean delayWakeUp = mode == MODE_WAKE_AND_UNLOCK && alwaysOnEnabled;
		Runnable wakeUp = ()-> {
		if (!wasDeviceInteractive) {
		if (DEBUG_FP_WAKELOCK) {
		Log.i(TAG, "fp wakelock: Authenticated, waking up...");
		}
		mPowerManager.wakeUp(SystemClock.uptimeMillis(), "android.policy:FINGERPRINT");
		}
		if (delayWakeUp) {
		mKeyguardViewMediator.onWakeAndUnlocking();
		}
		Trace.beginSection("release wake-and-unlock");
		releaseFingerprintWakeLock();
		Trace.endSection();
		};

		if (!delayWakeUp) {
		wakeUp.run();
		}
		switch (mMode) {
		case MODE_DISMISS_BOUNCER:
		Trace.beginSection("MODE_DISMISS");
		@@ -251,7 +264,11 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
		mUpdateMonitor.awakenFromDream();
		}
		mStatusBarWindowManager.setStatusBarFocusable(false);
		if (delayWakeUp) {
		mHandler.postDelayed(wakeUp, 50);
		} else {
		mKeyguardViewMediator.onWakeAndUnlocking();
		}
		if (mStatusBar.getNavigationBarView() != null) {
		mStatusBar.getNavigationBarView().setWakeAndUnlocking(true);
		}