Merge "Fix issue #9586838: Crash after waking up Hammerhead device" (97e1d53d) · Commits · e / os / android_frameworks_base

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

+35 −27

Original line number	Diff line number	Diff line
		@@ -7578,8 +7578,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		synchronized(this) {
		long ident = Binder.clearCallingIdentity();
		try {
		mLockScreenShown = shown;
		comeOutOfSleepIfNeededLocked();
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		@@ -7637,6 +7642,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		enforceCallingPermission(android.Manifest.permission.SET_DEBUG_APP,
		"setDebugApp()");

		long ident = Binder.clearCallingIdentity();
		try {
		// Note that this is not really thread safe if there are multiple
		// callers into it at the same time, but that's not a situation we
		// care about.
		@@ -7659,12 +7666,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		mWaitForDebugger = waitForDebugger;
		mDebugTransient = !persistent;
		if (packageName != null) {
		final long origId = Binder.clearCallingIdentity();
		forceStopPackageLocked(packageName, -1, false, false, true, true,
		UserHandle.USER_ALL, "set debug app");
		Binder.restoreCallingIdentity(origId);
		}
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		void setOpenGlTraceApp(ApplicationInfo app, String processName) {