Merge "Fix memory leaks in the accessibility layer." into ics-mr1 (e9f24a43) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,8 @@ public final class AccessibilityInteractionClient

	private final Rect mTempBounds = new Rect();		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>();		new SparseArray<IAccessibilityServiceConnection>();

	/**		/**
	@@ -517,8 +518,8 @@ public final class AccessibilityInteractionClient
	* @return The cached connection if such.		* @return The cached connection if such.
	*/		*/
	public IAccessibilityServiceConnection getConnection(int connectionId) {		public IAccessibilityServiceConnection getConnection(int connectionId) {
	synchronized (mConnectionCache) {		synchronized (sConnectionCache) {
	return mConnectionCache.get(connectionId);		return sConnectionCache.get(connectionId);
	}		}
	}		}

	@@ -529,8 +530,8 @@ public final class AccessibilityInteractionClient
	* @param connection The connection.		* @param connection The connection.
	*/		*/
	public void addConnection(int connectionId, IAccessibilityServiceConnection connection) {		public void addConnection(int connectionId, IAccessibilityServiceConnection connection) {
	synchronized (mConnectionCache) {		synchronized (sConnectionCache) {
	mConnectionCache.put(connectionId, connection);		sConnectionCache.put(connectionId, connection);
	}		}
	}		}

	@@ -540,8 +541,8 @@ public final class AccessibilityInteractionClient
	* @param connectionId The connection id.		* @param connectionId The connection id.
	*/		*/
	public void removeConnection(int connectionId) {		public void removeConnection(int connectionId) {
	synchronized (mConnectionCache) {		synchronized (sConnectionCache) {
	mConnectionCache.remove(connectionId);		sConnectionCache.remove(connectionId);
	}		}
	}		}
	}		}