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

Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev

Browse Source 
am: 15e2d7e50b

Change-Id: I524b8c1dcc44d075d2b0601b38d823cfa4cf90e5
This commit is contained in:
Fabian Kozynski
2019-06-05 13:18:11 -07:00
committed by android-build-merger
parent 18097dcef8 15e2d7e50b
commit d498396892
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1523,6 +1523,8 @@ public class StatusBar extends SystemUI implements DemoMode,
@Override // UnlockMethodCache.OnUnlockMethodChangedListener @Override // UnlockMethodCache.OnUnlockMethodChangedListener
public void onUnlockMethodStateChanged() { public void onUnlockMethodStateChanged() {
// Unlock method state changed. Notify KeguardMonitor
updateKeyguardState();
logStateToEventlog(); logStateToEventlog();
} }
@@ -3419,9 +3421,7 @@ public class StatusBar extends SystemUI implements DemoMode,
checkBarModes(); checkBarModes();
updateScrimController(); updateScrimController();
mPresenter.updateMediaMetaData(false, mState != StatusBarState.KEYGUARD); mPresenter.updateMediaMetaData(false, mState != StatusBarState.KEYGUARD);
mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(), updateKeyguardState();
mUnlockMethodCache.isMethodSecure(),
mStatusBarKeyguardViewManager.isOccluded());
Trace.endSection(); Trace.endSection();
} }
@@ -3460,6 +3460,12 @@ public class StatusBar extends SystemUI implements DemoMode,
mStatusBarStateController.setIsDozing(dozing); mStatusBarStateController.setIsDozing(dozing);
} }
private void updateKeyguardState() {
mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
mUnlockMethodCache.isMethodSecure(),
mStatusBarKeyguardViewManager.isOccluded());
}
public void onActivationReset() { public void onActivationReset() {
mKeyguardIndicationController.hideTransientIndication(); mKeyguardIndicationController.hideTransientIndication();
} }