Merge "Fix window token leak on multi-display targets" into android15-tests-dev (441f938a) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -1612,7 +1612,13 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
		* lock because this calls out to WindowManagerService.
		*/
		void addWindowTokensForAllDisplays() {
		final Display[] displays = mDisplayManager.getDisplays();
		Display[] displays = {};
		final long identity = Binder.clearCallingIdentity();
		try {
		displays = mDisplayManager.getDisplays();
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		for (int i = 0; i < displays.length; i++) {
		final int displayId = displays[i].getDisplayId();
		addWindowTokenForDisplay(displayId);
		@@ -1648,7 +1654,13 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
		}

		public void onRemoved() {
		final Display[] displays = mDisplayManager.getDisplays();
		Display[] displays = {};
		final long identity = Binder.clearCallingIdentity();
		try {
		displays = mDisplayManager.getDisplays();
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		for (int i = 0; i < displays.length; i++) {
		final int displayId = displays[i].getDisplayId();
		onDisplayRemoved(displayId);