Merge "Restore correct app State when combing "-D" and "--suspend" flags"

This commit is contained in:
Fabien Sanglard
2023-01-24 19:18:32 +00:00
committed by Android (Google) Code Review

View File

@@ -17844,11 +17844,9 @@ public class ActivityManagerService extends IActivityManager.Stub
*/
synchronized (wmLock) {
if ((startFlags & ActivityManager.START_FLAG_DEBUG) != 0) {
setDebugApp(aInfo.processName, true, false);
}
if ((startFlags & ActivityManager.START_FLAG_DEBUG_SUSPEND) != 0) {
setDebugApp(aInfo.processName, true, false, true);
boolean suspend =
(startFlags & ActivityManager.START_FLAG_DEBUG_SUSPEND) != 0;
setDebugApp(aInfo.processName, true, false, suspend);
}
if ((startFlags & ActivityManager.START_FLAG_NATIVE_DEBUGGING) != 0) {