Merge "ShellRoot: Hold lock during binder death." into rvc-dev am: dbc5e64b68... (e9000d5e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayContent.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -1105,6 +1105,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		}

		void removeShellRoot(int windowType) {
		synchronized(mWmService.mGlobalLock) {
		ShellRoot root = mShellRoots.get(windowType);
		if (root == null) {
		return;
		@@ -1112,6 +1113,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		root.clear();
		mShellRoots.remove(windowType);
		}
		}

		void setRemoteInsetsController(IDisplayWindowInsetsController controller) {
		if (mRemoteInsetsControlTarget != null) {