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 am: 801e5c0dd4 am: b11f623753

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

Change-Id: I9a33c7528dc1c34296764cc1c233ea909cff5c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charles Chen
2022-04-13 11:24:15 +00:00
committed by Automerger Merge Worker
parent 7fd4cd8a77 b11f623753
commit ce7b6c6118
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 final boolean mIsBootDisplayModeSupported;
private Context mOverlayContext;
// Called with SyncRoot lock held. // Called with SyncRoot lock held.
public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot, public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
Context context, Handler handler, Listener listener) { Context context, Handler handler, Listener listener) {
@@ -1222,7 +1224,10 @@ final class LocalDisplayAdapter extends DisplayAdapter {
/** Supplies a context whose Resources apply runtime-overlays */ /** Supplies a context whose Resources apply runtime-overlays */
Context getOverlayContext() { Context getOverlayContext() {
return ActivityThread.currentActivityThread().getSystemUiContext(); if (mOverlayContext == null) {
mOverlayContext = ActivityThread.currentActivityThread().getSystemUiContext();
}
return mOverlayContext;
} }
/** /**