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

Merge "Fix locked second screen on boot" into rvc-dev am: 2455e98420 am: 09960b9491

Browse Source 
Change-Id: I1b793d3661730a2315439a078793f72c33759434
This commit is contained in:
Chris Li
2020-03-31 16:33:47 +00:00
committed by Automerger Merge Worker
parent 116ea08de6 09960b9491
commit 02e1c314b7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,12 +126,14 @@ public class KeyguardDisplayManager {
final int displayId = display.getDisplayId(); final int displayId = display.getDisplayId();
Presentation presentation = mPresentations.get(displayId); Presentation presentation = mPresentations.get(displayId);
if (presentation == null) { if (presentation == null) {
presentation = new KeyguardPresentation(mContext, display, mInjectableInflater); final Presentation newPresentation =
presentation.setOnDismissListener(dialog -> { new KeyguardPresentation(mContext, display, mInjectableInflater);
if (null != mPresentations.get(displayId)) { newPresentation.setOnDismissListener(dialog -> {
if (newPresentation.equals(mPresentations.get(displayId))) {
mPresentations.remove(displayId); mPresentations.remove(displayId);
} }
}); });
presentation = newPresentation;
try { try {
presentation.show(); presentation.show();
} catch (WindowManager.InvalidDisplayException ex) { } catch (WindowManager.InvalidDisplayException ex) {