Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35b096bc authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am c89120c5: am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active... 

am c89120c5: am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

* commit 'c89120c557aa69c141e1af70e355f88d6b17ce2b':
  Invalid active window if temporary disabling accessibility for test tools.
parents a15dcc3f ae48539d

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;