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

Merge "Prevent KeyguardPresentation been dismissed."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-20 04:12:26 +00:00
committed by Android (Google) Code Review
parent 7be20fbce5 c21e6de908
commit 044b3d9ff2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
View File

@@ -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)) {
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);
}
}
@@ -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);