Merge "Ensure that debug builds crash again if there is a BinderProxy leak."... (962fb77d) · Commits · e / os / android_frameworks_base

core/java/android/os/Binder.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -778,6 +778,8 @@ final class BinderProxy implements IBinder {
	private static final int LOG_MAIN_INDEX_SIZE = 8;		private static final int LOG_MAIN_INDEX_SIZE = 8;
	private static final int MAIN_INDEX_SIZE = 1 << LOG_MAIN_INDEX_SIZE;		private static final int MAIN_INDEX_SIZE = 1 << LOG_MAIN_INDEX_SIZE;
	private static final int MAIN_INDEX_MASK = MAIN_INDEX_SIZE - 1;		private static final int MAIN_INDEX_MASK = MAIN_INDEX_SIZE - 1;
			// Debuggable builds will throw an AssertionError if the number of map entries exceeds:
			private static final int CRASH_AT_SIZE = 5_000;

	/**		/**
	* We next warn when we exceed this bucket size.		* We next warn when we exceed this bucket size.
	@@ -899,9 +901,14 @@ final class BinderProxy implements IBinder {
	keyArray[size] = key;		keyArray[size] = key;
	}		}
	if (size >= mWarnBucketSize) {		if (size >= mWarnBucketSize) {
			final int total_size = size();
	Log.v(Binder.TAG, "BinderProxy map growth! bucket size = " + size		Log.v(Binder.TAG, "BinderProxy map growth! bucket size = " + size
	+ " total = " + size());		+ " total = " + total_size);
	mWarnBucketSize += WARN_INCREMENT;		mWarnBucketSize += WARN_INCREMENT;
			if (Build.IS_DEBUGGABLE && total_size > CRASH_AT_SIZE) {
			throw new AssertionError("Binder ProxyMap has too many entries. "
			+ "BinderProxy leak?");
			}
	}		}
	}		}