Merge "Fix cyclic keyguard state notification" (6e11c388) · Commits · e / os / android_frameworks_base

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -649,15 +649,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		.Callback() {
		@Override
		public void onFinished() {
		notifyKeyguardState();
		}

		@Override
		public void onCancelled() {
		notifyKeyguardState();
		}

		private void notifyKeyguardState() {
		if (mStatusBarKeyguardViewManager == null) {
		Log.w(TAG, "Tried to notify keyguard visibility when "
		+ "mStatusBarKeyguardViewManager was null");
		@@ -665,6 +656,12 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		mStatusBarKeyguardViewManager.onKeyguardFadedAway();
		}

		@Override
		public void onCancelled() {
		// Transition was cancelled because another one took over.
		// Nothing to do in here but wait.
		}
		};

		private NotificationMessagingUtil mMessagingUtil;