Merge "Don't hold sProxyLock while retrieving interface descriptors." am: ef6fe13c77 am: d4d27b403c (d231b2a3) · Commits · e / os / android_frameworks_base

core/java/android/os/BinderProxy.java

+30 −29

Original line number	Diff line number	Diff line
		@@ -242,9 +242,16 @@ public final class BinderProxy implements IBinder {
		}

		Map<String, Integer> counts = new HashMap<>();
		final ArrayList<WeakReference<BinderProxy>> proxiesToQuery =
		new ArrayList<WeakReference<BinderProxy>>();
		synchronized (sProxyMap) {
		for (ArrayList<WeakReference<BinderProxy>> a : mMainIndexValues) {
		if (a != null) {
		for (WeakReference<BinderProxy> weakRef : a) {
		proxiesToQuery.addAll(a);
		}
		}
		}
		for (WeakReference<BinderProxy> weakRef : proxiesToQuery) {
		BinderProxy bp = weakRef.get();
		String key;
		if (bp == null) {
		@@ -266,8 +273,6 @@ public final class BinderProxy implements IBinder {
		counts.put(key, i + 1);
		}
		}
		}
		}
		Map.Entry<String, Integer>[] sorted = counts.entrySet().toArray(
		new Map.Entry[counts.size()]);

		@@ -355,10 +360,8 @@ public final class BinderProxy implements IBinder {
		* @hide
		*/
		public static InterfaceCount[] getSortedInterfaceCounts(int num) {
		synchronized (sProxyMap) {
		return sProxyMap.getSortedInterfaceCounts(num);
		}
		}

		/**
		* Returns the number of binder proxies held in this process.
		@@ -377,12 +380,10 @@ public final class BinderProxy implements IBinder {
		*/
		public static void dumpProxyDebugInfo() {
		if (Build.IS_DEBUGGABLE) {
		synchronized (sProxyMap) {
		sProxyMap.dumpProxyInterfaceCounts();
		sProxyMap.dumpPerUidProxyCounts();
		}
		}
		}

		/**
		* Return a BinderProxy for IBinder.