Merge "Use user id 0 to get missing appId for debugger" into nyc-dev (792918e5) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -6036,7 +6036,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (appId < 0 && packageName != null) {
		try {
		appId = UserHandle.getAppId(AppGlobals.getPackageManager()
		.getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, userId));
		.getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, 0));
		} catch (RemoteException e) {
		}
		}

+1 −15

Original line number	Diff line number	Diff line
		@@ -1097,21 +1097,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		// Don't debug things in the system process
		if (!aInfo.processName.equals("system")) {
		if ((startFlags & ActivityManager.START_FLAG_DEBUG) != 0) {
		final ProcessRecord app = mService.getProcessRecordLocked(
		aInfo.processName, aInfo.applicationInfo.uid, true);
		// If the process already started, we can't wait for debugger and shouldn't
		// modify the debug settings.
		// For non-persistent debug, normally we set the debug app here, and restores
		// to the original at attachApplication time. However, if the app process
		// already exists, we won't get another attachApplication, and the debug setting
		// never gets restored. Furthermore, if we get two such calls back-to-back,
		// both mOrigDebugApp and mDebugApp will become the same app, and it won't be
		// cleared even if we get attachApplication after the app process is killed.
		if (app == null \|\| app.thread == null) {
		mService.setDebugApp(aInfo.processName, true, false);
		} else {
		Slog.w(TAG, "Ignoring waitForDebugger because process already exists");
		}
		}

		if ((startFlags & ActivityManager.START_FLAG_NATIVE_DEBUGGING) != 0) {