Merge "Do not kill the server process itself"

2023-03-27 18:25:08 +00:00
parent d7f3028003 de38940fb5
commit b38b1408dc
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -2573,7 +2573,10 @@ public final class ProcessList {
                    + ", " + 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;