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

Commit 33e82cd3 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling... 

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

* commit '58be3b36d515942100f6fe5e232e73ac882c9d71':
  Invalid active window if temporary disabling accessibility for test tools.
parents 7c1de6c0 479eb799

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

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

    }





    int getActiveWindowId() {

    int getActiveWindowId() {

        return mSecurityPolicy.mActiveWindowId;

        return mSecurityPolicy.getActiveWindowId();

    }

    }





    void onTouchInteractionStart() {

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




        private int resolveAccessibilityWindowIdLocked(int accessibilityWindowId) {

        private int resolveAccessibilityWindowIdLocked(int accessibilityWindowId) {

            if (accessibilityWindowId == AccessibilityNodeInfo.ACTIVE_WINDOW_ID) {

            if (accessibilityWindowId == AccessibilityNodeInfo.ACTIVE_WINDOW_ID) {

                return mSecurityPolicy.mActiveWindowId;

                return mSecurityPolicy.getActiveWindowId();

            }

            }

            return accessibilityWindowId;

            return accessibilityWindowId;

        }

        }
@@ -3284,7 +3284,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 




        public void clearWindowsLocked() {

        public void clearWindowsLocked() {

            List<AccessibilityWindowInfo> windows = Collections.emptyList();

            List<AccessibilityWindowInfo> windows = Collections.emptyList();

            final int activeWindowId = mActiveWindowId;

            updateWindowsLocked(windows);

            updateWindowsLocked(windows);

            mActiveWindowId = activeWindowId;

            mWindows = null;

            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) {

        private void setActiveWindowLocked(int windowId) {

            if (mActiveWindowId != windowId) {

            if (mActiveWindowId != windowId) {

                mActiveWindowId = windowId;

                mActiveWindowId = windowId;