Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flash of ambient on fp unlock" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-19 15:26:11 +00:00
committed by Android (Google) Code Review
parent 65ffdba7f7 be9df03cbf
commit c885c24e10
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5050,6 +5050,12 @@ public class StatusBar extends SystemUI implements DemoMode,
mDozing = mDozingRequested && mState == StatusBarState.KEYGUARD mDozing = mDozingRequested && mState == StatusBarState.KEYGUARD
|| mFingerprintUnlockController.getMode() || mFingerprintUnlockController.getMode()
== FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING; == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;
// When in wake-and-unlock we may not have received a change to mState
// but we still should not be dozing, manually set to false.
if (mFingerprintUnlockController.getMode() ==
FingerprintUnlockController.MODE_WAKE_AND_UNLOCK) {
mDozing = false;
}
mStatusBarWindowManager.setDozing(mDozing); mStatusBarWindowManager.setDozing(mDozing);
updateDozingState(); updateDozingState();
Trace.endSection(); Trace.endSection();