Merge "Fix issue #6745498: Cannot view consecutive event details from agenda view" into jb-dev (cfb0f409) · Commits · e / os / android_frameworks_base

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

+14 −5

Original line number	Diff line number	Diff line
		@@ -5704,12 +5704,19 @@ public final class ActivityManagerService extends ActivityManagerNative

		if (killProcesses) {
		// Find any running processes associated with this app.
		final String pkg = component.getPackageName();
		ArrayList<ProcessRecord> procs = new ArrayList<ProcessRecord>();
		SparseArray<ProcessRecord> appProcs
		= mProcessNames.getMap().get(component.getPackageName());
		if (appProcs != null) {
		for (int i=0; i<appProcs.size(); i++) {
		procs.add(appProcs.valueAt(i));
		HashMap<String, SparseArray<ProcessRecord>> pmap = mProcessNames.getMap();
		for (SparseArray<ProcessRecord> uids : pmap.values()) {
		for (int i=0; i<uids.size(); i++) {
		ProcessRecord proc = uids.valueAt(i);
		if (proc.userId != tr.userId) {
		continue;
		}
		if (!proc.pkgList.contains(pkg)) {
		continue;
		}
		procs.add(proc);
		}
		}

		@@ -5720,6 +5727,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		Slog.i(TAG, "Killing " + pr.toShortString() + ": remove task");
		EventLog.writeEvent(EventLogTags.AM_KILL, pr.pid,
		pr.processName, pr.setAdj, "remove task");
		pr.killedBackground = true;
		Process.killProcessQuiet(pr.pid);
		} else {
		pr.waitingToKill = "remove task";
		@@ -14634,6 +14642,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		Slog.i(TAG, "Killing " + app.toShortString() + ": " + app.waitingToKill);
		EventLog.writeEvent(EventLogTags.AM_KILL, app.pid,
		app.processName, app.setAdj, app.waitingToKill);
		app.killedBackground = true;
		Process.killProcessQuiet(app.pid);
		success = false;
		} else {

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -2347,6 +2347,9 @@ final class ActivityStack {
		while (i > 0) {
		i--;
		ActivityRecord candidate = mHistory.get(i);
		if (candidate.finishing) {
		continue;
		}
		if (candidate.task.taskId != task) {
		break;
		}
		@@ -4057,7 +4060,7 @@ final class ActivityStack {
		int index = indexOfActivityLocked(r);
		if (index >= 0) {
		if (r.state == ActivityState.DESTROYING) {
		cleanUpActivityLocked(r, true, true);
		cleanUpActivityLocked(r, true, false);
		removeActivityFromHistoryLocked(r);
		}
		}