commit b38b1408dcf98a5b800cbe29e44d4b8e0bbb5afb
author Bart Van Assche <bvanassche@google.com> Mon Mar 27 18:25:08 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 27 18:25:08 2023 +0000
tree 9fb14d5f41e0d38b4e741dd7d61bc03aa92b7391
parent d7f3028003ed760e708e376ffc073090e5aaeb25
parent de38940fb5c8cc44a1835180ccc177c11431c47e

Merge "Do not kill the server process itself"

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

diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index abddc43..256df98 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -2573,7 +2573,10 @@
                     + ", " + reason);
             app.setPendingStart(false);
             killProcessQuiet(pid);
-            Process.killProcessGroup(app.uid, app.getPid());
+            final int appPid = app.getPid();
+            if (appPid != 0) {
+                Process.killProcessGroup(app.uid, appPid);
+            }
             noteAppKill(app, ApplicationExitInfo.REASON_OTHER,
                     ApplicationExitInfo.SUBREASON_INVALID_START, reason);
             return false;