am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev (c35ae6e7) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -4636,15 +4636,14 @@ public final class ActivityThread {
	if (DEBUG_PROVIDER) Slog.v(TAG, "Cleaning up dead provider "		if (DEBUG_PROVIDER) Slog.v(TAG, "Cleaning up dead provider "
	+ provider + " " + prc.holder.info.name);		+ provider + " " + prc.holder.info.name);
	mProviderRefCountMap.remove(provider);		mProviderRefCountMap.remove(provider);
	if (prc.client != null && prc.client.mNames != null) {		for (int i=mProviderMap.size()-1; i>=0; i--) {
	for (String name : prc.client.mNames) {		ProviderClientRecord pr = mProviderMap.valueAt(i);
	ProviderClientRecord pr = mProviderMap.get(name);
	if (pr != null && pr.mProvider.asBinder() == provider) {		if (pr != null && pr.mProvider.asBinder() == provider) {
	Slog.i(TAG, "Removing dead content provider: " + name);		Slog.i(TAG, "Removing dead content provider:" + pr.mProvider.toString());
	mProviderMap.remove(name);		mProviderMap.removeAt(i);
	}
	}		}
	}		}

	if (fromClient) {		if (fromClient) {
	// We found out about this due to execution in our client		// We found out about this due to execution in our client
	// code. Tell the activity manager about it now, to ensure		// code. Tell the activity manager about it now, to ensure