Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev (54b0a05b) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -759,7 +759,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}

		int getActiveWindowId() {
		return mSecurityPolicy.mActiveWindowId;
		return mSecurityPolicy.getActiveWindowId();
		}

		void onTouchInteractionStart() {
		@@ -2823,7 +2823,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {

		private int resolveAccessibilityWindowIdLocked(int accessibilityWindowId) {
		if (accessibilityWindowId == AccessibilityNodeInfo.ACTIVE_WINDOW_ID) {
		return mSecurityPolicy.mActiveWindowId;
		return mSecurityPolicy.getActiveWindowId();
		}
		return accessibilityWindowId;
		}
		@@ -3284,7 +3284,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {

		public void clearWindowsLocked() {
		List<AccessibilityWindowInfo> windows = Collections.emptyList();
		final int activeWindowId = mActiveWindowId;
		updateWindowsLocked(windows);
		mActiveWindowId = activeWindowId;
		mWindows = null;
		}

		@@ -3497,6 +3499,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}
		}

		public int getActiveWindowId() {
		if (mActiveWindowId == INVALID_WINDOW_ID && !mTouchInteractionInProgress) {
		mActiveWindowId = getFocusedWindowId();
		}
		return mActiveWindowId;
		}

		private void setActiveWindowLocked(int windowId) {
		if (mActiveWindowId != windowId) {
		mActiveWindowId = windowId;