Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am efe0f19c: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev

Browse Source 
* commit 'efe0f19cd99b5d5ab72fa0c261cb30c0d708efc9':
  Fix memory leak in accessibility cache.
This commit is contained in:
Svetoslav
2014-09-21 18:15:48 +00:00
committed by Android Git Automerger
parent 749f4a2bc4 582dc798f2
commit ea2ecf1611
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/view/accessibility/AccessibilityCache.java
View File

@@ -63,22 +63,6 @@ final class AccessibilityCache {
}
}
public void clearWindows() {
synchronized (mLock) {
final int windowCount = mWindowCache.size();
for (int i = windowCount - 1; i >= 0; i--) {
AccessibilityWindowInfo window = mWindowCache.valueAt(i);
if (window != null) {
if (DEBUG) {
Log.i(LOG_TAG, "Removing window: " + window.getId());
}
window.recycle();
mWindowCache.removeAt(i);
}
}
}
}
/**
* Notifies the cache that the something in the UI changed. As a result
* the cache will either refresh some nodes or evict some nodes.
@@ -115,8 +99,9 @@ final class AccessibilityCache {
clearSubTreeLocked(event.getWindowId(), event.getSourceNodeId());
} break;
case AccessibilityEvent.TYPE_WINDOWS_CHANGED: {
clearWindows();
case AccessibilityEvent.TYPE_WINDOWS_CHANGED:
case AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED: {
clear();
} break;
}
}
@@ -287,7 +272,7 @@ final class AccessibilityCache {
private void clearNodesForWindowLocked(int windowId) {
if (DEBUG) {
Log.i(LOG_TAG, "clearWindowLocked(" + windowId + ")");
Log.i(LOG_TAG, "clearNodesForWindowLocked(" + windowId + ")");
}
LongSparseArray<AccessibilityNodeInfo> nodes = mNodeCache.get(windowId);
if (nodes == null) {
@@ -440,7 +425,7 @@ final class AccessibilityCache {
}
}
if (!childOfItsParent) {
Log.e(LOG_TAG, "Invalid parent-child ralation between parent: "
Log.e(LOG_TAG, "Invalid parent-child relation between parent: "
+ nodeParent + " and child: " + node);
}
}
@@ -452,7 +437,7 @@ final class AccessibilityCache {
if (child != null) {
AccessibilityNodeInfo parent = nodes.get(child.getParentNodeId());
if (parent != node) {
Log.e(LOG_TAG, "Invalid child-parent ralation between child: "
Log.e(LOG_TAG, "Invalid child-parent relation between child: "
+ node + " and parent: " + nodeParent);
}
}