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

Commit 4e1633b0 authored by Hiroki Sato's avatar Hiroki Sato
Browse files

Fix AccessibilityWindowManager#dump outputs duplicated entry in multi-display 

Currently, focus related state is dumped for each display, but they're
managed globally in Ac11yWindowManager, not per display in
DisplayWindowsObserver.

dump of these variables should be done only once in A11yWindowManager.

Bug: none
Test: dumpsys accessibility
Change-Id: Ib8f6fe02ee9ee83eb6de3f459388c8ff7e58f71e
parent 984306a8

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

+8 −7
Original line number Diff line number Diff line
@@ -943,17 +943,11 @@ public class AccessibilityWindowManager { 
         * Dumps all {@link AccessibilityWindowInfo}s here.

         */

        void dumpLocked(FileDescriptor fd, final PrintWriter pw, String[] args) {

            pw.append("Global Info [ ");

            pw.println("Top focused display Id = " + mTopFocusedDisplayId);

            pw.println("     Active Window Id = " + mActiveWindowId);

            pw.println("     Top Focused Window Id = " + mTopFocusedWindowId);

            pw.println("     Accessibility Focused Window Id = " + mAccessibilityFocusedWindowId

                    + " ]");

            if (mIsProxy) {

                pw.println("Proxy accessibility focused window = "

                        + mProxyDisplayAccessibilityFocusedWindow);

            }

                pw.println();

            }

            if (mWindows != null) {

                final int windowCount = mWindows.size();

                for (int j = 0; j < windowCount; j++) {
@@ -2199,6 +2193,13 @@ public class AccessibilityWindowManager { 
     * Dumps all {@link AccessibilityWindowInfo}s here.

     */

    public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {

        pw.append("Global Info [ ");

        pw.println("Top focused display Id = " + mTopFocusedDisplayId);

        pw.println("     Active Window Id = " + mActiveWindowId);

        pw.println("     Top Focused Window Id = " + mTopFocusedWindowId);

        pw.println("     Accessibility Focused Window Id = " + mAccessibilityFocusedWindowId

                + " ]");

        pw.println();

        final int count = mDisplayWindowsObservers.size();

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

            final DisplayWindowsObserver observer = mDisplayWindowsObservers.valueAt(i);