Revert "Kill process asynchronously on updateOomAdjLocked." (6a1972ba) · Commits · e / os / android_frameworks_base

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

+4 −13

Original line number	Diff line number	Diff line
		@@ -18606,19 +18606,19 @@ public final class ActivityManagerService extends ActivityManagerNative
		mNumCachedHiddenProcs++;
		numCached++;
		if (numCached > cachedProcessLimit) {
		postKillProc(app, "cached #" + numCached, true);
		app.kill("cached #" + numCached, true);
		}
		break;
		case ActivityManager.PROCESS_STATE_CACHED_EMPTY:
		if (numEmpty > ProcessList.TRIM_EMPTY_APPS
		&& app.lastActivityTime < oldTime) {
		postKillProc(app, "empty for "
		app.kill("empty for "
		+ ((oldTime + ProcessList.MAX_EMPTY_TIME - app.lastActivityTime)
		/ 1000) + "s", true);
		} else {
		numEmpty++;
		if (numEmpty > emptyProcessLimit) {
		postKillProc(app, "empty #" + numEmpty, true);
		app.kill("empty #" + numEmpty, true);
		}
		}
		break;
		@@ -18634,7 +18634,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		// definition not re-use the same process again, and it is
		// good to avoid having whatever code was running in them
		// left sitting around after no longer needed.
		postKillProc(app, "isolated not needed", true);
		app.kill("isolated not needed", true);
		}

		if (app.curProcState >= ActivityManager.PROCESS_STATE_HOME
		@@ -18859,15 +18859,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		private void postKillProc(final ProcessRecord app, final String reason, final boolean noisy) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		app.kill(reason, noisy);
		}
		});
		}

		final void trimApplications() {
		synchronized (this) {
		int i;