Merge "Prevent KeyguardPresentation been dismissed." (044b3d9f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -72,11 +72,12 @@ public class KeyguardDisplayManager {
		@Override
		public void onDisplayChanged(int displayId) {
		if (displayId == DEFAULT_DISPLAY) return;
		final Display display = mDisplayService.getDisplay(displayId);
		if (display != null && mShowing) {
		final Presentation presentation = mPresentations.get(displayId);
		if (presentation != null && !presentation.getDisplay().equals(display)) {
		if (presentation != null && mShowing) {
		hidePresentation(displayId);
		// update DisplayInfo.
		final Display display = mDisplayService.getDisplay(displayId);
		if (display != null) {
		showPresentation(display);
		}
		}
		@@ -265,6 +266,11 @@ public class KeyguardDisplayManager {
		setCancelable(false);
		}

		@Override
		public void cancel() {
		// Do not allow anything to cancel KeyguardPresetation except KeyguardDisplayManager.
		}

		@Override
		public void onDetachedFromWindow() {
		mClock.removeCallbacks(mMoveTextRunnable);