am 0bfdd7c: am e9f24a4: Merge "Fix memory leaks in the accessibility layer." into ics-mr1

* commit '0bfdd7c2927fb683b89fdd52befe643e8e069e77':
  Fix memory leaks in the accessibility layer.

Author: sganov

core/java/android/view/accessibility/AccessibilityInteractionClient.java

@@ -93,7 +93,8 @@ public final class AccessibilityInteractionClient
 
     private final Rect mTempBounds = new Rect();
 
-    private final SparseArray<IAccessibilityServiceConnection> mConnectionCache =
+    // The connection cache is shared between all interrogating threads.
+    private static final SparseArray<IAccessibilityServiceConnection> sConnectionCache =
         new SparseArray<IAccessibilityServiceConnection>();
 
     /**
@@ -539,8 +540,8 @@ private Message getSameProcessMessageAndClear() {
      * @return The cached connection if such.
      */
     public IAccessibilityServiceConnection getConnection(int connectionId) {
-        synchronized (mConnectionCache) {
-            return mConnectionCache.get(connectionId);
+        synchronized (sConnectionCache) {
+            return sConnectionCache.get(connectionId);
         }
     }
 
@@ -551,8 +552,8 @@ public IAccessibilityServiceConnection getConnection(int connectionId) {
      * @param connection The connection.
      */
     public void addConnection(int connectionId, IAccessibilityServiceConnection connection) {
-        synchronized (mConnectionCache) {
-            mConnectionCache.put(connectionId, connection);
+        synchronized (sConnectionCache) {
+            sConnectionCache.put(connectionId, connection);
         }
     }
 
@@ -562,8 +563,8 @@ public void addConnection(int connectionId, IAccessibilityServiceConnection conn
      * @param connectionId The connection id.
      */
     public void removeConnection(int connectionId) {
-        synchronized (mConnectionCache) {
-            mConnectionCache.remove(connectionId);
+        synchronized (sConnectionCache) {
+            sConnectionCache.remove(connectionId);
         }
     }
 }