summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-10-12 01:24:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-10-12 01:24:48 +0000
commit15c8747ad9e6c53c92beccb312ed4c1fe2acf89f (patch)
treec1ecccaba85bd2eddb08b0066c5f6f00aac9cf7c
parentadaae4cb914b9c721d26b6bc8c6cbbdbe4dcc590 (diff)
parent9704426d14a69b1ffda278b9b5f65f7f41136347 (diff)
Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev
-rw-r--r--core/java/android/view/accessibility/AccessibilityCache.java2
-rw-r--r--services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java1
2 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityCache.java b/core/java/android/view/accessibility/AccessibilityCache.java
index 0f21c5c85f4b..d7851171cd67 100644
--- a/core/java/android/view/accessibility/AccessibilityCache.java
+++ b/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();
}
}
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 02f645a07a5f..c8dc9ff51a1b 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 @@ public class AccessibilityCacheTest {
mAccessibilityCache.clear();
AccessibilityInteractionClient.getInstance().clearCache();
assertEquals(0, numA11yWinInfosInUse.get());
- assertEquals(0, numA11yNodeInfosInUse.get());
}
@Test