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

am: 15c8747ad9

Change-Id: I1b1c16800319aac6abf8403f168d0b4343293fc0

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

@@ -329,8 +329,6 @@ public final class AccessibilityCache {
                 final long oldParentId = oldInfo.getParentNodeId();
                 if (info.getParentNodeId() != oldParentId) {
                     clearSubTreeLocked(windowId, oldParentId);
-                } else {
-                    oldInfo.recycle();
                 }
            }
 

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

@@ -77,7 +77,6 @@ public class AccessibilityCacheTest {
         mAccessibilityCache.clear();
         AccessibilityInteractionClient.getInstance().clearCache();
         assertEquals(0, numA11yWinInfosInUse.get());
-        assertEquals(0, numA11yNodeInfosInUse.get());
     }
 
     @Test