am a001e51f: am 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active... (a201082c) · Commits · e / os / android_frameworks_base

libs/hwui/PathTessellator.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -942,7 +942,8 @@ public:
		}
		private:
		bool initialized = false;
		double lastX, lastY;
		double lastX = 0;
		double lastY = 0;
		double sum = 0;
		};

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

+17 −11

Original line number	Diff line number	Diff line
		@@ -8538,13 +8538,16 @@ public final class ActivityManagerService extends ActivityManagerNative
		return;
		}

		// Find any running services associated with this app and stop if needed.
		mServices.cleanUpRemovedTaskLocked(tr, component, new Intent(tr.getBaseIntent()));

		if (!killProcess) {
		return;
		}

		// Determine if the process(es) for this task should be killed.
		final String pkg = component.getPackageName();
		ArrayList<ProcessRecord> procsToKill = new ArrayList<ProcessRecord>();
		ArrayList<ProcessRecord> procsToKill = new ArrayList<>();
		ArrayMap<String, SparseArray<ProcessRecord>> pmap = mProcessNames.getMap();
		for (int i = 0; i < pmap.size(); i++) {

		@@ -8573,20 +8576,24 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		if (proc.foregroundServices) {
		// Don't kill process(es) with foreground service.
		return;
		}

		// Add process to kill list.
		procsToKill.add(proc);
		}
		}

		// Find any running services associated with this app and stop if needed.
		mServices.cleanUpRemovedTaskLocked(tr, component, new Intent(tr.getBaseIntent()));

		// Kill the running processes.
		for (int i = 0; i < procsToKill.size(); i++) {
		ProcessRecord pr = procsToKill.get(i);
		if (pr.setSchedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE) {
		if (pr.setSchedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE
		&& pr.curReceiver == null) {
		pr.kill("remove task", true);
		} else {
		// We delay killing processes that are not in the background or running a receiver.
		pr.waitingToKill = "remove task";
		}
		}
		@@ -18358,8 +18365,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		private final boolean applyOomAdjLocked(ProcessRecord app,
		ProcessRecord TOP_APP, boolean doingAll, long now) {
		private final boolean applyOomAdjLocked(ProcessRecord app, boolean doingAll, long now) {
		boolean success = true;

		if (app.curRawAdj != app.setRawAdj) {
		@@ -18381,8 +18387,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (DEBUG_SWITCH \|\| DEBUG_OOM_ADJ) Slog.v(TAG_OOM_ADJ,
		"Setting process group of " + app.processName
		+ " to " + app.curSchedGroup);
		if (app.waitingToKill != null &&
		app.setSchedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE) {
		if (app.waitingToKill != null && app.curReceiver == null
		&& app.setSchedGroup == Process.THREAD_GROUP_BG_NONINTERACTIVE) {
		app.kill(app.waitingToKill, true);
		success = false;
		} else {
		@@ -18612,7 +18618,7 @@ public final class ActivityManagerService extends ActivityManagerNative

		computeOomAdjLocked(app, cachedAdj, TOP_APP, doingAll, now);

		return applyOomAdjLocked(app, TOP_APP, doingAll, now);
		return applyOomAdjLocked(app, doingAll, now);
		}

		final void updateProcessForegroundLocked(ProcessRecord proc, boolean isForeground,
		@@ -18830,7 +18836,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		applyOomAdjLocked(app, TOP_APP, true, now);
		applyOomAdjLocked(app, true, now);

		// Count the number of process types.
		switch (app.curProcState) {