Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a3a627a authored by Fabien Sanglard's avatar Fabien Sanglard Committed by Android (Google) Code Review
Browse files

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

parents 0a1cd47f cb8031e1

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

+3 −5
Original line number Diff line number Diff line
@@ -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) {