Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev (15e2d7e5) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -1520,6 +1520,8 @@ public class StatusBar extends SystemUI implements DemoMode,

		@Override // UnlockMethodCache.OnUnlockMethodChangedListener
		public void onUnlockMethodStateChanged() {
		// Unlock method state changed. Notify KeguardMonitor
		updateKeyguardState();
		logStateToEventlog();
		}

		@@ -3416,9 +3418,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		checkBarModes();
		updateScrimController();
		mPresenter.updateMediaMetaData(false, mState != StatusBarState.KEYGUARD);
		mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
		mUnlockMethodCache.isMethodSecure(),
		mStatusBarKeyguardViewManager.isOccluded());
		updateKeyguardState();
		Trace.endSection();
		}

		@@ -3457,6 +3457,12 @@ public class StatusBar extends SystemUI implements DemoMode,
		mStatusBarStateController.setIsDozing(dozing);
		}

		private void updateKeyguardState() {
		mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
		mUnlockMethodCache.isMethodSecure(),
		mStatusBarKeyguardViewManager.isOccluded());
		}

		public void onActivationReset() {
		mKeyguardIndicationController.hideTransientIndication();
		}