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

Merge "Cache OverContext to prevent deadlock" into tm-dev

Browse Source
This commit is contained in:
Charles Chen
2022-04-13 10:57:07 +00:00
committed by Android (Google) Code Review
parent 087964ad18 a4c0fc9a67
commit 801e5c0dd4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -76,6 +76,8 @@ final class LocalDisplayAdapter extends DisplayAdapter {
private final boolean mIsBootDisplayModeSupported;
private Context mOverlayContext;
// Called with SyncRoot lock held.
public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
Context context, Handler handler, Listener listener) {
@@ -1222,7 +1224,10 @@ final class LocalDisplayAdapter extends DisplayAdapter {
/** Supplies a context whose Resources apply runtime-overlays */
Context getOverlayContext() {
return ActivityThread.currentActivityThread().getSystemUiContext();
if (mOverlayContext == null) {
mOverlayContext = ActivityThread.currentActivityThread().getSystemUiContext();
}
return mOverlayContext;
}
/**