Work on issue #25467052: System lagged out (9ba6eb99) · Commits · e / os / android_frameworks_base

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,11 @@ public final class ActivityManagerService extends ActivityManagerNative
		// before we decide it must be hung.
		static final int CONTENT_PROVIDER_PUBLISH_TIMEOUT = 10*1000;

		// How long we will retain processes hosting content providers in the "last activity"
		// state before allowing them to drop down to the regular cached LRU list. This is
		// to avoid thrashing of provider processes under low memory situations.
		static final int CONTENT_PROVIDER_RETAIN_TIME = 20*1000;

		// How long we wait for a launched process to attach to the activity manager
		// before we decide it's never going to come up for real, when the process was
		// started with a wrapper for instrumentation (such as Valgrind) because it
		@@ -9448,6 +9453,14 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (conn.stableCount == 0 && conn.unstableCount == 0) {
		cpr.connections.remove(conn);
		conn.client.conProviders.remove(conn);
		if (conn.client.setProcState < ActivityManager.PROCESS_STATE_LAST_ACTIVITY) {
		// The client is more important than last activity -- note the time this
		// is happening, so we keep the old provider process around a bit as last
		// activity to avoid thrashing it.
		if (cpr.proc != null) {
		cpr.proc.lastProviderTime = SystemClock.uptimeMillis();
		}
		}
		stopAssociationLocked(conn.client.uid, conn.client.processName, cpr.uid, cpr.name);
		return true;
		}
		@@ -18203,6 +18216,18 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		if (app.lastProviderTime > 0 && (app.lastProviderTime+CONTENT_PROVIDER_RETAIN_TIME) > now) {
		if (adj > ProcessList.PREVIOUS_APP_ADJ) {
		adj = ProcessList.PREVIOUS_APP_ADJ;
		schedGroup = Process.THREAD_GROUP_BG_NONINTERACTIVE;
		app.cached = false;
		app.adjType = "provider";
		}
		if (procState > ActivityManager.PROCESS_STATE_LAST_ACTIVITY) {
		procState = ActivityManager.PROCESS_STATE_LAST_ACTIVITY;
		}
		}

		if (mayBeTop && procState > ActivityManager.PROCESS_STATE_TOP) {
		// A client of one of our services or providers is in the top state. We
		// may want to be in the top state, but not if we are already running in

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ final class ProcessRecord {
		long curCpuTime; // How long proc has run CPU most recently
		long lastRequestedGc; // When we last asked the app to do a gc
		long lastLowMemory; // When we last told the app that memory is low
		long lastProviderTime; // The last time someone else was using a provider in this process.
		boolean reportLowMemory; // Set to true when waiting to report low mem
		boolean empty; // Is this an empty background process?
		boolean cached; // Is this a cached process?
		@@ -317,6 +318,11 @@ final class ProcessRecord {
		pw.print(" foregroundActivities="); pw.print(foregroundActivities);
		pw.print(" (rep="); pw.print(repForegroundActivities); pw.println(")");
		}
		if (lastProviderTime > 0) {
		pw.print(prefix); pw.print("lastProviderTime=");
		TimeUtils.formatDuration(lastProviderTime, now, pw);
		pw.println();
		}
		if (hasStartedServices) {
		pw.print(prefix); pw.print("hasStartedServices="); pw.println(hasStartedServices);
		}