diff options
| author | 2017-10-12 02:30:42 +0000 | |
|---|---|---|
| committer | 2017-10-12 02:30:42 +0000 | |
| commit | b19789f80a6203bf44ebad5b99ffff439b1fa86b (patch) | |
| tree | c86fd00af6dee37faab65e99ab2942852ab4c85d | |
| parent | f93d8aa3dfd1950fdb832547a5b53e4d1eee726c (diff) | |
| parent | 73e2acb9aed740e678bea7751d752c4e1cc37e24 (diff) | |
Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev am: 15c8747ad9
am: 73e2acb9ae
Change-Id: I906748223efd88d5d48889b2866725ba13c0268e
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityCache.java | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/accessibility/AccessibilityCacheTest.java | 1 |
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 |