Merge "Work on issue #29328569: NPE in " com.google.android.configupdater"" into nyc-dev (6bc33b07) · Commits · e / os / android_frameworks_base

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

+36 −39

Original line number	Diff line number	Diff line
		@@ -3520,13 +3520,11 @@ public final class ActivityManagerService extends ActivityManagerNative

		// app launch boost for big.little configurations
		// use cpusets to migrate freshly launched tasks to big cores
		synchronized(ActivityManagerService.this) {
		nativeMigrateToBoost();
		mIsBoosted = true;
		mBoostStartTime = SystemClock.uptimeMillis();
		Message msg = mHandler.obtainMessage(APP_BOOST_DEACTIVATE_MSG);
		mHandler.sendMessageDelayed(msg, APP_BOOST_MESSAGE_DELAY);
		}

		// We don't have to do anything more if:
		// (1) There is an existing application record; and
		@@ -3539,7 +3537,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		+ " thread=" + (app != null ? app.thread : null)
		+ " pid=" + (app != null ? app.pid : -1));
		if (app != null && app.pid > 0) {
		if (!knownToBeDead \|\| app.thread == null) {
		if ((!knownToBeDead && !app.killed) \|\| app.thread == null) {
		// We already have the app running, or are waiting for it to
		// come up (we have a pid but not yet its thread), so keep it.
		if (DEBUG_PROCESSES) Slog.v(TAG_PROCESSES, "App already running: " + app);
		@@ -10581,7 +10579,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		boolean providerRunning = cpr != null;
		boolean providerRunning = cpr != null && cpr.proc != null && !cpr.proc.killed;
		if (providerRunning) {
		cpi = cpr.info;
		String msg;
		@@ -10623,7 +10621,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		if (cpr.proc != null) {
		checkTime(startTime, "getContentProviderImpl: before updateOomAdj");
		boolean success = updateOomAdjLocked(cpr.proc);
		maybeUpdateProviderUsageStatsLocked(r, cpr.info.packageName, name);
		@@ -10652,7 +10649,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		providerRunning = false;
		conn = null;
		}
		}

		Binder.restoreCallingIdentity(origId);
		}
		@@ -10795,7 +10791,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		checkTime(startTime, "getContentProviderImpl: looking for process record");
		ProcessRecord proc = getProcessRecordLocked(
		cpi.processName, cpr.appInfo.uid, false);
		if (proc != null && proc.thread != null) {
		if (proc != null && proc.thread != null && !proc.killed) {
		if (DEBUG_PROVIDER) Slog.d(TAG_PROVIDER,
		"Installing in existing process " + proc);
		if (!proc.pubProviders.containsKey(cpi.name)) {
		@@ -16600,7 +16596,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		&& capp.pid != MY_PID) {
		capp.kill("depends on provider "
		+ cpr.name.flattenToShortString()
		+ " in dying proc " + (proc != null ? proc.processName : "??"), true);
		+ " in dying proc " + (proc != null ? proc.processName : "??")
		+ " (adj " + (proc != null ? proc.setAdj : "??") + ")", true);
		}
		} else if (capp.thread != null && conn.provider.provider != null) {
		try {