commit 73e2acb9aed740e678bea7751d752c4e1cc37e24
author Phil Weaver <pweaver@google.com> Thu Oct 12 01:38:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 01:38:32 2017 +0000
tree df1f5973e6a8cedb6a4503121b6ad88f93fc3ca0
parent 0a2c71668e2c463259e51a67adaeff909ff600fc
parent 15c8747ad9e6c53c92beccb312ed4c1fe2acf89f

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

diff --git a/core/java/android/view/accessibility/AccessibilityCache.java b/core/java/android/view/accessibility/AccessibilityCache.java
index 0f21c5c..d785117 100644
--- a/core/java/android/view/accessibility/AccessibilityCache.java
+++ b/core/java/android/view/accessibility/AccessibilityCache.java
@@ -329,8 +329,6 @@
                 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

diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java
index 02f645a..c8dc9ff 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java
@@ -77,7 +77,6 @@
         mAccessibilityCache.clear();
         AccessibilityInteractionClient.getInstance().clearCache();
         assertEquals(0, numA11yWinInfosInUse.get());
-        assertEquals(0, numA11yNodeInfosInUse.get());
     }
 
     @Test