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

Merge "Add the missing lock on the process start timeout handling" into tm-dev am: 9bcc78687c

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

Change-Id: I5a4ab99d22e38f2e00dd3b9550d21550a8a667f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2022-05-10 20:28:41 +00:00
committed by Automerger Merge Worker
parent a237cddd64 9bcc78687c
commit abd11d63b9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2028,8 +2028,10 @@ public final class ProcessList {
mService.mProcessList.handlePredecessorProcDied((ProcessRecord) msg.obj); mService.mProcessList.handlePredecessorProcDied((ProcessRecord) msg.obj);
break; break;
case MSG_PROCESS_KILL_TIMEOUT: case MSG_PROCESS_KILL_TIMEOUT:
synchronized (mService) {
mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj, mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj,
/* isKillTimeout */ true); /* isKillTimeout */ true);
}
break; break;
} }
} }