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

Commit bc59ca4b authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 31462128: Merge "Avoid tearing down process groups twice." 

* commit '31462128':
  Avoid tearing down process groups twice.
parents 37da3f0d 31462128

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

+5 −3
Original line number Diff line number Diff line
@@ -4874,9 +4874,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
            stats.noteProcessDiedLocked(app.info.uid, pid);

        }













        if (!app.killed) {















            Process.killProcessQuiet(pid);















            Process.killProcessGroup(app.info.uid, pid);















            app.killed = true;













        }





























        // Clean up already done if the process has been re-started.















        if (app.pid == pid && app.thread != null &&