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

Merge "Unlock icon regardless of transient error" into qt-r1-dev am: ce22fb44d9

Browse Source 
am: 736f63e16e

Change-Id: I44430bdad67552f5929d54dc406dd7d799d7c668
This commit is contained in:
Kevin Chyn
2019-06-17 21:26:23 -07:00
committed by android-build-merger
parent 16bde3c77d 736f63e16e
commit 18aac02e17
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,10 +420,10 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
private int getState() {
KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
if (mTransientBiometricsError) {
return STATE_BIOMETRICS_ERROR;
} else if ((mUnlockMethodCache.canSkipBouncer() || !mKeyguardShowing) && !mSimLocked) {
if ((mUnlockMethodCache.canSkipBouncer() || !mKeyguardShowing) && !mSimLocked) {
return STATE_LOCK_OPEN;
} else if (mTransientBiometricsError) {
return STATE_BIOMETRICS_ERROR;
} else if (updateMonitor.isFaceDetectionRunning()) {
return STATE_SCANNING_FACE;
} else {