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

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

am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 

* commit '15cd6302':
  Avoid tearing down process groups twice.
parents d9d48cc9 15cd6302

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

+5 −3
Original line number Diff line number Diff line
@@ -4657,9 +4657,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 &&