Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use user id 0 to get missing appId for debugger

Browse Source 
When forceStopPackageLocked is used to kill existing app process for
relaunching with debugger, user id could be -1 and getPackageUid will
already return -1. This results in killPackageProcessesLocked() not
able to find and kill the app, and wait for debugger will.

This also revert commit 55c9d739 (ag/969408) which tried to fix the
same problem but got it wrong. It's valid to -D when the process is
already running, as we're supposed to kill it. The really problem is
that the killing fails because of bad appId.

bug: 28980761
Change-Id: Ibebdcc26865464216a1f4b6773e540921cdad7d2
This commit is contained in:
Chong Zhang
2016-06-09 16:15:27 -07:00
parent c0b602c441
commit d25944e120
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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) {
}
}

16
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -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");
}
mService.setDebugApp(aInfo.processName, true, false);
}
if ((startFlags & ActivityManager.START_FLAG_NATIVE_DEBUGGING) != 0) {