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

Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev am: 83c4135

Browse Source 
am: 2f54479

* commit '2f54479f77a4b78ef793bab72b80c53a25193655':
  Do not set waitForDebugger if the process to be debugged already started

Change-Id: I36bd3770f21e8df6ddb9e68e4588b99b92a44db8
This commit is contained in:
Chong Zhang
2016-04-26 23:47:46 +00:00
committed by android-build-merger
parent 58832c0128 2f54479f77
commit 178701db31
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1097,7 +1097,21 @@ 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) {
mService.setDebugApp(aInfo.processName, true, false);
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) {