am e1b4437d: Revert "Fix content provider" (f52e9f70) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+5 −9

Original line number	Diff line number	Diff line
		@@ -7414,8 +7414,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		// In this case the provider is a single instance, so we can
		// return it right away.
		if (r != null) {
		if(true) Log.v(TAG, "Adding content provider requested by "+
		r.processName +" from process "+cpr.info.processName);
		r.conProviders.add(cpr);
		cpr.clients.add(r);
		} else {
		@@ -7526,8 +7524,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		mProvidersByName.put(name, cpr);

		if (r != null) {
		if(true) Log.v(TAG, "Adding content provider requested by "+
		r.processName +" from process "+cpr.info.processName);
		r.conProviders.add(cpr);
		cpr.clients.add(r);
		} else {
		@@ -7583,7 +7579,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		ContentProviderRecord cpr = (ContentProviderRecord)mProvidersByName.get(name);
		if(cpr == null) {
		//remove from mProvidersByClass
		if(true) Log.v(TAG, name+" content provider not found in providers list");
		if(localLOGV) Log.v(TAG, name+" content provider not found in providers list");
		return;
		}
		final ProcessRecord r = getRecordForAppLocked(caller);
		@@ -7594,11 +7590,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		}
		//update content provider record entry info
		ContentProviderRecord localCpr = (ContentProviderRecord) mProvidersByClass.get(cpr.info.name);
		if(true) Log.v(TAG, "Removing content provider requested by "+
		r.processName+" from process "+localCpr.info.processName);
		if(localCpr.app == r) {
		if(localLOGV) Log.v(TAG, "Removing content provider requested by "+
		r.info.processName+" from process "+localCpr.appInfo.processName);
		if(localCpr.appInfo.processName == r.info.processName) {
		//should not happen. taken care of as a local provider
		if(true) Log.v(TAG, "local provider doing nothing Ignoring other names");
		if(localLOGV) Log.v(TAG, "local provider doing nothing Ignoring other names");
		return;
		} else {
		localCpr.clients.remove(r);