commit 044b3d9ff232badfcf5730a1afb2e55eafcc1b69
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 20 04:12:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 20 04:12:26 2020 +0000
tree 38ee70ca342c8319d10a2f3db98dda7c2d123441
parent 7be20fbce571dfed7026dba2b5c91b66d761c80c
parent c21e6de9085fa0fe6b4755bd5473b2b5ffcdc70f

Merge "Prevent KeyguardPresentation been dismissed."

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

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
index 571c4ae..11bf24d 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
@@ -72,11 +72,12 @@
         @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)) {
-                    hidePresentation(displayId);
+            final Presentation presentation = mPresentations.get(displayId);
+            if (presentation != null && mShowing) {
+                hidePresentation(displayId);
+                // update DisplayInfo.
+                final Display display = mDisplayService.getDisplay(displayId);
+                if (display != null) {
                     showPresentation(display);
                 }
             }
@@ -266,6 +267,11 @@
         }
 
         @Override
+        public void cancel() {
+            // Do not allow anything to cancel KeyguardPresetation except KeyguardDisplayManager.
+        }
+
+        @Override
         public void onDetachedFromWindow() {
             mClock.removeCallbacks(mMoveTextRunnable);
         }