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

Commit 53454a1c authored by Phil Weaver's avatar Phil Weaver
Browse files

Don't let non-touchable windows retain a11y focus 

Accessibility services can't see non-touchable windows,
so those windows should not be allowed to have
accessibility focus.

Bug: 70986605
Test: Manually went through bug steps, verified that
double-tapping on the screen has no effect.

Change-Id: I7be72331c5704f7aa99714a01bbb2e336eea15e1
parent 200de1cc

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

+10 −0
Original line number Diff line number Diff line
@@ -3129,6 +3129,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            boolean activeWindowGone = true;



            final int windowCount = windows.size();



            // We'll clear accessibility focus if the window with focus is no longer visible to

            // accessibility services

            boolean shouldClearAccessibilityFocus =

                    mAccessibilityFocusedWindowId != INVALID_WINDOW_ID;

            if (windowCount > 0) {

                for (int i = 0; i < windowCount; i++) {

                    WindowInfo windowInfo = windows.get(i);
@@ -3166,6 +3171,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    }

                    if (window.getId() == mAccessibilityFocusedWindowId) {

                        window.setAccessibilityFocused(true);

                        shouldClearAccessibilityFocus = false;

                    }

                }

            }
@@ -3176,6 +3182,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            for (int i = oldWindowCount - 1; i >= 0; i--) {

                oldWindowList.remove(i).recycle();

            }



            if (shouldClearAccessibilityFocus) {

                clearAccessibilityFocus(mAccessibilityFocusedWindowId);

            }

        }



        private void sendEventsForChangedWindowsLocked(List<AccessibilityWindowInfo> oldWindows,