resolved conflicts for merge of 60df172f to master (12b4a4a7) · Commits · e / os / android_frameworks_base

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

+28 −29

Original line number	Diff line number	Diff line
		@@ -2894,10 +2894,38 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (!isolated) {
		app = getProcessRecordLocked(processName, info.uid, keepIfLarge);
		checkTime(startTime, "startProcess: after getProcessRecord");

		if ((intentFlags & Intent.FLAG_FROM_BACKGROUND) != 0) {
		// If we are in the background, then check to see if this process
		// is bad. If so, we will just silently fail.
		if (mBadProcesses.get(info.processName, info.uid) != null) {
		if (DEBUG_PROCESSES) Slog.v(TAG, "Bad process: " + info.uid
		+ "/" + info.processName);
		return null;
		}
		} else {
		// When the user is explicitly starting a process, then clear its
		// crash count so that we won't make it bad until they see at
		// least one crash dialog again, and make the process good again
		// if it had been bad.
		if (DEBUG_PROCESSES) Slog.v(TAG, "Clearing bad process: " + info.uid
		+ "/" + info.processName);
		mProcessCrashTimes.remove(info.processName, info.uid);
		if (mBadProcesses.get(info.processName, info.uid) != null) {
		EventLog.writeEvent(EventLogTags.AM_PROC_GOOD,
		UserHandle.getUserId(info.uid), info.uid,
		info.processName);
		mBadProcesses.remove(info.processName, info.uid);
		if (app != null) {
		app.bad = false;
		}
		}
		}
		} else {
		// If this is an isolated process, it can't re-use an existing process.
		app = null;
		}

		// We don't have to do anything more if:
		// (1) There is an existing application record; and
		// (2) The caller doesn't think it is dead, OR there is no thread
		@@ -2931,35 +2959,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		String hostingNameStr = hostingName != null
		? hostingName.flattenToShortString() : null;

		if (!isolated) {
		if ((intentFlags&Intent.FLAG_FROM_BACKGROUND) != 0) {
		// If we are in the background, then check to see if this process
		// is bad. If so, we will just silently fail.
		if (mBadProcesses.get(info.processName, info.uid) != null) {
		if (DEBUG_PROCESSES) Slog.v(TAG_PROCESSES, "Bad process: " + info.uid
		+ "/" + info.processName);
		return null;
		}
		} else {
		// When the user is explicitly starting a process, then clear its
		// crash count so that we won't make it bad until they see at
		// least one crash dialog again, and make the process good again
		// if it had been bad.
		if (DEBUG_PROCESSES) Slog.v(TAG_PROCESSES, "Clearing bad process: " + info.uid
		+ "/" + info.processName);
		mProcessCrashTimes.remove(info.processName, info.uid);
		if (mBadProcesses.get(info.processName, info.uid) != null) {
		EventLog.writeEvent(EventLogTags.AM_PROC_GOOD,
		UserHandle.getUserId(info.uid), info.uid,
		info.processName);
		mBadProcesses.remove(info.processName, info.uid);
		if (app != null) {
		app.bad = false;
		}
		}
		}
		}

		if (app == null) {
		checkTime(startTime, "startProcess: creating new process record");
		app = newProcessRecordLocked(info, processName, isolated, isolatedUid);