Fix issue #5253941: ICS ignoring provider's android:process flag (2a6bcda0) · Commits · e / os / android_frameworks_base

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

+37 −19

Original line number	Diff line number	Diff line
		@@ -1631,8 +1631,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		if (app.conProviders.size() > 0) {
		for (ContentProviderRecord cpr : app.conProviders.keySet()) {
		if (cpr.app != null && cpr.app.lruSeq != mLruSeq) {
		updateLruProcessInternalLocked(cpr.app, oomAdj,
		if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {
		updateLruProcessInternalLocked(cpr.proc, oomAdj,
		updateActivityTime, i+1);
		}
		}
		@@ -3374,6 +3374,23 @@ public final class ActivityManagerService extends ActivityManagerNative
		bringDownServiceLocked(services.get(i), true);
		}

		ArrayList<ContentProviderRecord> providers = new ArrayList<ContentProviderRecord>();
		for (ContentProviderRecord provider : mProvidersByClass.values()) {
		if (provider.info.packageName.equals(name)
		&& (provider.proc == null \|\| evenPersistent \|\| !provider.proc.persistent)) {
		if (!doit) {
		return true;
		}
		didSomething = true;
		providers.add(provider);
		}
		}

		N = providers.size();
		for (i=0; i<N; i++) {
		removeDyingProviderLocked(null, providers.get(i));
		}

		if (doit) {
		if (purgeCache) {
		AttributeCache ac = AttributeCache.instance();
		@@ -5485,7 +5502,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		ComponentName comp = new ComponentName(cpi.packageName, cpi.name);
		ContentProviderRecord cpr = mProvidersByClass.get(comp);
		if (cpr == null) {
		cpr = new ContentProviderRecord(cpi, app.info);
		cpr = new ContentProviderRecord(cpi, app.info, comp);
		mProvidersByClass.put(comp, cpr);
		}
		app.pubProviders.put(cpi.name, cpr);
		@@ -5643,25 +5660,25 @@ public final class ActivityManagerService extends ActivityManagerNative
		// return it right away.
		final boolean countChanged = incProviderCount(r, cpr);
		if (countChanged) {
		if (cpr.app != null && r.setAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) {
		if (cpr.proc != null && r.setAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) {
		// If this is a perceptible app accessing the provider,
		// make sure to count it as being accessed and thus
		// back up on the LRU list. This is good because
		// content providers are often expensive to start.
		updateLruProcessLocked(cpr.app, false, true);
		updateLruProcessLocked(cpr.proc, false, true);
		}
		}

		if (cpr.app != null) {
		if (cpr.proc != null) {
		if (false) {
		if (cpr.name.flattenToShortString().equals(
		"com.android.providers.calendar/.CalendarProvider2")) {
		Slog.v(TAG, "****************** KILLING "
		+ cpr.name.flattenToShortString());
		Process.killProcess(cpr.app.pid);
		Process.killProcess(cpr.proc.pid);
		}
		}
		boolean success = updateOomAdjLocked(cpr.app);
		boolean success = updateOomAdjLocked(cpr.proc);
		if (DEBUG_PROVIDER) Slog.i(TAG, "Adjust success: " + success);
		// NOTE: there is still a race here where a signal could be
		// pending on the process even though we managed to update its
		@@ -5676,7 +5693,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		"Existing provider " + cpr.name.flattenToShortString()
		+ " is crashing; detaching " + r);
		boolean lastRef = decProviderCount(r, cpr);
		appDiedLocked(cpr.app, cpr.app.pid, cpr.app.thread);
		appDiedLocked(cpr.proc, cpr.proc.pid, cpr.proc.thread);
		if (!lastRef) {
		// This wasn't the last ref our process had on
		// the provider... we have now been killed, bail.
		@@ -5729,7 +5746,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		+ cpi.name);
		return null;
		}
		cpr = new ContentProviderRecord(cpi, ai);
		cpr = new ContentProviderRecord(cpi, ai, comp);
		} catch (RemoteException ex) {
		// pm is in same process, this will never happen.
		}
		@@ -5864,7 +5881,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		//update content provider record entry info
		ComponentName comp = new ComponentName(cpr.info.packageName, cpr.info.name);
		ContentProviderRecord localCpr = mProvidersByClass.get(comp);
		if (localCpr.app == r) {
		if (localCpr.proc == r) {
		//should not happen. taken care of as a local provider
		Slog.w(TAG, "removeContentProvider called on local provider: "
		+ cpr.info.name + " in process " + r.processName);
		@@ -5940,7 +5957,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		synchronized (dst) {
		dst.provider = src.provider;
		dst.app = r;
		dst.proc = r;
		dst.notifyAll();
		}
		updateOomAdjLocked(r);
		@@ -8706,9 +8723,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		r.dump(pw, " ");
		} else {
		pw.print(" * "); pw.print(e.getKey().flattenToShortString());
		if (r.app != null) {
		if (r.proc != null) {
		pw.println(":");
		pw.print(" "); pw.println(r.app);
		pw.print(" "); pw.println(r.proc);
		} else {
		pw.println();
		}
		@@ -9440,7 +9457,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		cpr.notifyAll();
		}

		mProvidersByClass.remove(cpr.info.name);
		mProvidersByClass.remove(cpr.name);
		String names[] = cpr.info.authority.split(";");
		for (int j = 0; j < names.length; j++) {
		mProvidersByName.remove(names[j]);
		@@ -9454,9 +9471,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		&& capp.pid != MY_PID) {
		Slog.i(TAG, "Kill " + capp.processName
		+ " (pid " + capp.pid + "): provider " + cpr.info.name
		+ " in dying process " + proc.processName);
		+ " in dying process " + (proc != null ? proc.processName : "??"));
		EventLog.writeEvent(EventLogTags.AM_KILL, capp.pid,
		capp.processName, capp.setAdj, "dying provider " + proc.processName);
		capp.processName, capp.setAdj, "dying provider "
		+ cpr.name.toShortString());
		Process.killProcessQuiet(capp.pid);
		}
		}
		@@ -9515,7 +9533,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		while (it.hasNext()) {
		ContentProviderRecord cpr = it.next();
		cpr.provider = null;
		cpr.app = null;
		cpr.proc = null;

		// See if someone is waiting for this provider... in which
		// case we don't remove it, but just let it restart.

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -32,15 +32,15 @@ class ContentProviderRecord extends ContentProviderHolder {
		final ApplicationInfo appInfo;
		final ComponentName name;
		int externals; // number of non-framework processes supported by this provider
		ProcessRecord app; // if non-null, hosting application
		ProcessRecord proc; // if non-null, hosting process.
		ProcessRecord launchingApp; // if non-null, waiting for this app to be launched.
		String stringName;

		public ContentProviderRecord(ProviderInfo _info, ApplicationInfo ai) {
		public ContentProviderRecord(ProviderInfo _info, ApplicationInfo ai, ComponentName _name) {
		super(_info);
		uid = ai.uid;
		appInfo = ai;
		name = new ComponentName(_info.packageName, _info.name);
		name = _name;
		noReleaseNeeded = uid == 0 \|\| uid == Process.SYSTEM_UID;
		}

		@@ -61,7 +61,7 @@ class ContentProviderRecord extends ContentProviderHolder {
		pw.print(prefix); pw.print("package=");
		pw.print(info.applicationInfo.packageName);
		pw.print(" process="); pw.println(info.processName);
		pw.print(prefix); pw.print("app="); pw.println(app);
		pw.print(prefix); pw.print("proc="); pw.println(proc);
		if (launchingApp != null) {
		pw.print(prefix); pw.print("launchingApp="); pw.println(launchingApp);
		}