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

Commit 30abc90f authored by Jacky Kao's avatar Jacky Kao
Browse files

Revert "Uses SF callback windows for the A11yWindowInfo [1/n]" 

Revert submission 16249364-Surface Flinger

Reason for revert: Large increase (~200%) in system_server memory usage (b/214255324)
Reverted Changes:
I14c5e9889:Apply display transform to window bounds and node ...
I0ac0d0487:Use shellRoot to identify PIP menu window
I83e898d91:Uses SF callback windows for the A11yWindowInfo [2...
I94d7ed4fb:Uses SF callback windows for the A11yWindowInfo [1...

Change-Id: Icb3b07750ebaa0c26d38165dd1a01b2af4b8b5a6
parent fb3af5bb

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

+0 −19
Original line number Diff line number Diff line
@@ -667,10 +667,6 @@ public class AccessibilityWindowManager { 
                return null;

            }



            // Don't need to add the embedded hierarchy windows into the accessibility windows list.

            if (mHostEmbeddedMap.size() > 0 && isEmbeddedHierarchyWindowsLocked(windowId)) {

                return null;

            }

            final AccessibilityWindowInfo reportedWindow = AccessibilityWindowInfo.obtain();



            reportedWindow.setId(windowId);
@@ -703,21 +699,6 @@ public class AccessibilityWindowManager { 
            return reportedWindow;

        }



        private boolean isEmbeddedHierarchyWindowsLocked(int windowId) {

            final IBinder leashToken = mWindowIdMap.get(windowId);

            if (leashToken == null) {

                return false;

            }



            for (int i = 0; i < mHostEmbeddedMap.size(); i++) {

                if (mHostEmbeddedMap.keyAt(i).equals(leashToken)) {

                    return true;

                }

            }



            return false;

        }



        private int getTypeForWindowManagerWindowType(int windowType) {

            switch (windowType) {

                case WindowManager.LayoutParams.TYPE_APPLICATION:

services/core/java/com/android/server/wm/AccessibilityController.java

+196 −98

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java

deleted100644 → 0
+0 −533

File deleted.

Preview size limit exceeded, changes collapsed.