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

Commit 73e2acb9 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev 

am: 15c8747a

Change-Id: I1b1c16800319aac6abf8403f168d0b4343293fc0
parents 0a2c7166 15c8747a

core/java/android/view/accessibility/AccessibilityCache.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -329,8 +329,6 @@ public final class AccessibilityCache { 
                final long oldParentId = oldInfo.getParentNodeId();

                final long oldParentId = oldInfo.getParentNodeId();

                if (info.getParentNodeId() != oldParentId) {

                if (info.getParentNodeId() != oldParentId) {

                    clearSubTreeLocked(windowId, oldParentId);

                    clearSubTreeLocked(windowId, oldParentId);

                } else {

                    oldInfo.recycle();

                }

                }

           }

           }

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,6 @@ public class AccessibilityCacheTest { 
        mAccessibilityCache.clear();

        mAccessibilityCache.clear();

        AccessibilityInteractionClient.getInstance().clearCache();

        AccessibilityInteractionClient.getInstance().clearCache();

        assertEquals(0, numA11yWinInfosInUse.get());

        assertEquals(0, numA11yWinInfosInUse.get());

        assertEquals(0, numA11yNodeInfosInUse.get());

    }

    }





    @Test

    @Test