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

Commit 7611a5d3 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." 

* commit '5acdd0f6':
  [ActivityManager] Ensure alive process is not killedByAm.
parents e0849423 5acdd0f6

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

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -2839,6 +2839,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            app.setPid(startResult.pid);

            app.usingWrapper = startResult.usingWrapper;

            app.removed = false;

            app.killedByAm = false;

            synchronized (mPidsSelfLocked) {

                this.mPidsSelfLocked.put(startResult.pid, app);

                Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);