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

Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am: 801e5c0dd4" into tm-mainline-prod am: 6d513cdb61

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17499147

Change-Id: I5269cc2a55400528cc05438fe9ea1eec69611f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-04-13 11:33:56 +00:00
parent 58c6bfbe8c 6d513cdb61
commit 031e70f266
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) {
@@ -1237,7 +1239,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;
}
/**