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

Commit e0195319 authored by Hiroki Sato's avatar Hiroki Sato
Browse files

Small cleanup AccessibilityWindowManager#updateWindowsLocked 

After a flag compute_window_changes_on_a11y_v2 is removed [1], a
method #populateReportedWindowLocked returns non-null. Thus we can
simplify some window computation in A11yWindowManager.

[1] Ifd8328fd21f5547726313c65c60d2a4b0d6095af

Bug: 322444245
Test: atest AccessibilityWindowManagerTest
Flag: EXEMPT cleanup after removing com.android.server.accessibility.compute_window_changes_on_a11y_v2
Change-Id: Idbb99e276b06cd742d0e3bef96171852d41cbdd7
parent 72061cd0

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

+5 −20
Original line number Diff line number Diff line
@@ -832,20 +832,12 @@ public class AccessibilityWindowManager { 
                        != AccessibilityWindowInfo.UNDEFINED_WINDOW_ID;

            }



            boolean hasWindowIgnore = false;

            if (windowCount > 0) {

                if (mTrackingWindows) {

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

                        final WindowInfo windowInfo = windows.get(i);

                    final AccessibilityWindowInfo window;

                    if (mTrackingWindows) {

                        window = populateReportedWindowLocked(userId, windowInfo, oldWindowsById);

                        if (window == null) {

                            hasWindowIgnore = true;

                        }

                    } else {

                        window = null;

                    }

                    if (window != null) {

                        final AccessibilityWindowInfo window =

                                populateReportedWindowLocked(userId, windowInfo, oldWindowsById);



                        // Flip layers in list to be consistent with AccessibilityService#getWindows

                        window.setLayer(windowCount - 1 - window.getLayer());
@@ -870,13 +862,6 @@ public class AccessibilityWindowManager { 
                    }

                }

                final int accessibilityWindowCount = mWindows.size();

                // Re-order the window layer of all windows in the windows list because there's

                // window not been added into the windows list.

                if (hasWindowIgnore) {

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

                        mWindows.get(i).setLayer(accessibilityWindowCount - 1 - i);

                    }

                }

                if (isTopFocusedDisplay) {

                    if (mTouchInteractionInProgress && activeWindowGone) {

                        mActiveWindowId = mTopFocusedWindowId;