Merge "Debug issue #17310019: pause when launching settings" into lmp-dev (3d073952) · Commits · e / os / android_frameworks_base

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

+22 −0

Original line number	Diff line number	Diff line
		@@ -8948,6 +8948,14 @@ public final class ActivityManagerService extends ActivityManagerNative
		return false;
		}

		private void checkTime(long startTime, String where) {
		long now = SystemClock.elapsedRealtime();
		if ((now-startTime) > 1000) {
		// If we are taking more than a second, log about it.
		Slog.w(TAG, "Slow operation: " + (now-startTime) + "ms so far, now at " + where);
		}
		}

		private final ContentProviderHolder getContentProviderImpl(IApplicationThread caller,
		String name, IBinder token, boolean stable, int userId) {
		ContentProviderRecord cpr;
		@@ -8955,6 +8963,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		ProviderInfo cpi = null;

		synchronized(this) {
		long startTime = SystemClock.elapsedRealtime();

		ProcessRecord r = null;
		if (caller != null) {
		r = getRecordForAppLocked(caller);
		@@ -8968,6 +8978,8 @@ public final class ActivityManagerService extends ActivityManagerNative

		boolean checkCrossUser = true;

		checkTime(startTime, "getContentProviderImpl: getProviderByName");

		// First check if this content provider has been published...
		cpr = mProviderMap.getProviderByName(name, userId);
		// If that didn't work, check if it exists for user 0 and then
		@@ -8992,10 +9004,12 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (providerRunning) {
		cpi = cpr.info;
		String msg;
		checkTime(startTime, "getContentProviderImpl: before checkContentProviderPermission");
		if ((msg = checkContentProviderPermissionLocked(cpi, r, userId, checkCrossUser))
		!= null) {
		throw new SecurityException(msg);
		}
		checkTime(startTime, "getContentProviderImpl: after checkContentProviderPermission");

		if (r != null && cpr.canRunHere(r)) {
		// This provider has been published or is in the process
		@@ -9011,6 +9025,8 @@ public final class ActivityManagerService extends ActivityManagerNative

		final long origId = Binder.clearCallingIdentity();

		checkTime(startTime, "getContentProviderImpl: incProviderCountLocked");

		// In this case the provider instance already exists, so we can
		// return it right away.
		conn = incProviderCountLocked(r, cpr, token, stable);
		@@ -9020,7 +9036,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		// make sure to count it as being accessed and thus
		// back up on the LRU list. This is good because
		// content providers are often expensive to start.
		checkTime(startTime, "getContentProviderImpl: before updateLruProcess");
		updateLruProcessLocked(cpr.proc, false, null);
		checkTime(startTime, "getContentProviderImpl: after updateLruProcess");
		}
		}

		@@ -9033,7 +9051,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		Process.killProcess(cpr.proc.pid);
		}
		}
		checkTime(startTime, "getContentProviderImpl: before updateOomAdj");
		boolean success = updateOomAdjLocked(cpr.proc);
		checkTime(startTime, "getContentProviderImpl: after updateOomAdj");
		if (DEBUG_PROVIDER) Slog.i(TAG, "Adjust success: " + success);
		// NOTE: there is still a race here where a signal could be
		// pending on the process even though we managed to update its
		@@ -9048,7 +9068,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		"Existing provider " + cpr.name.flattenToShortString()
		+ " is crashing; detaching " + r);
		boolean lastRef = decProviderCountLocked(conn, cpr, token, stable);
		checkTime(startTime, "getContentProviderImpl: before appDied");
		appDiedLocked(cpr.proc);
		checkTime(startTime, "getContentProviderImpl: after appDied");
		if (!lastRef) {
		// This wasn't the last ref our process had on
		// the provider... we have now been killed, bail.

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import java.io.OutputStream;
		import java.nio.ByteBuffer;

		import android.app.ActivityManager;
		import android.os.SystemClock;
		import com.android.internal.util.MemInfoReader;
		import com.android.server.wm.WindowManagerService;

		@@ -528,12 +529,18 @@ final class ProcessList {
		if (amt == UNKNOWN_ADJ)
		return;

		long start = SystemClock.elapsedRealtime();
		ByteBuffer buf = ByteBuffer.allocate(4 * 4);
		buf.putInt(LMK_PROCPRIO);
		buf.putInt(pid);
		buf.putInt(uid);
		buf.putInt(amt);
		writeLmkd(buf);
		long now = SystemClock.elapsedRealtime();
		if ((now-start) > 250) {
		Slog.w("ActivityManager", "SLOW OOM ADJ: " + (now-start) + "ms for pid " + pid
		+ " = " + amt);
		}
		}

		/*