Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not kill the server process itself" am: b38b1408dc am: 629a3621d3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2503855

Change-Id: I2dc9a4d71862a2663b2cb7cd14150f3484de3baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche
2023-03-27 19:04:43 +00:00
committed by Automerger Merge Worker
parent 6047b6ba40 629a3621d3
commit 590b5a3dad
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -2573,7 +2573,10 @@ public final class ProcessList {
+ ", " + reason); + ", " + reason);
app.setPendingStart(false); app.setPendingStart(false);
killProcessQuiet(pid); 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, noteAppKill(app, ApplicationExitInfo.REASON_OTHER,
ApplicationExitInfo.SUBREASON_INVALID_START, reason); ApplicationExitInfo.SUBREASON_INVALID_START, reason);
return false; return false;