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

Merge "ShellRoot: Hold lock during binder death." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-26 23:42:46 +00:00
committed by Android (Google) Code Review
parent 57e977a585 1dc572934c
commit dbc5e64b68
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1106,12 +1106,14 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
} }
void removeShellRoot(int windowType) { void removeShellRoot(int windowType) {
ShellRoot root = mShellRoots.get(windowType); synchronized(mWmService.mGlobalLock) {
if (root == null) { ShellRoot root = mShellRoots.get(windowType);
return; if (root == null) {
return;
}
root.clear();
mShellRoots.remove(windowType);
} }
root.clear();
mShellRoots.remove(windowType);
} }
void setRemoteInsetsController(IDisplayWindowInsetsController controller) { void setRemoteInsetsController(IDisplayWindowInsetsController controller) {