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

Commit 15cd6302 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "Avoid tearing down process groups twice." into lmp-mr1-dev

parents 2122e14c 034ef013

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

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

            stats.noteProcessDiedLocked(app.info.uid, pid);

        }

        }




















        if (!app.killed) {











            Process.killProcessQuiet(pid);







            Process.killProcessQuiet(pid);











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







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











            app.killed = true;







            app.killed = true;














        }



























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







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











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







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