Merge "Work on issue #28200735: AcitvityManagerService lock held for..." into nyc-dev (e76ffd19) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -10320,9 +10320,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		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.
		long now = SystemClock.uptimeMillis();
		if ((now-startTime) > 50) {
		// If we are taking more than 50ms, log about it.
		Slog.w(TAG, "Slow operation: " + (now-startTime) + "ms so far, now at " + where);
		}
		}
		@@ -10334,7 +10334,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		ProviderInfo cpi = null;

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

		ProcessRecord r = null;
		if (caller != null) {