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

Workaround SysUI crash with incorrect Context for Theme.

Browse Source 
Using Context without the Theme information attached means we end up
crashing on the keyguard on a secondary display.

Bug: 175669925
Test: Manually verify no longer crashing

Change-Id: I24dcc128c21f5f719645d8298c43825eb6388694
This commit is contained in:
Ben Murdoch
2021-01-11 11:42:41 +00:00
parent cfcab3dc3c
commit 31369c2163
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,7 @@ public class KeyguardDisplayManager {
private static final int VIDEO_SAFE_REGION = 80; // Percentage of display width & height
private static final int MOVE_CLOCK_TIMEOUT = 10000; // 10s
private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;
private final Context mContext;
private KeyguardClockSwitchController mKeyguardClockSwitchController;
private View mClock;
private int mUsableWidth;
@@ -278,6 +279,7 @@ public class KeyguardDisplayManager {
WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;
setCancelable(false);
mContext = context;
}
@Override
@@ -301,7 +303,7 @@ public class KeyguardDisplayManager {
mMarginLeft = (100 - VIDEO_SAFE_REGION) * bounds.width() / 200;
mMarginTop = (100 - VIDEO_SAFE_REGION) * bounds.height() / 200;
setContentView(LayoutInflater.from(getContext())
setContentView(LayoutInflater.from(mContext)
.inflate(R.layout.keyguard_presentation, null));
// Logic to make the lock screen fullscreen