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 am: abd11d63b9

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

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

6
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);
break;
case MSG_PROCESS_KILL_TIMEOUT:
mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj,
/* isKillTimeout */ true);
synchronized (mService) {
mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj,
/* isKillTimeout */ true);
}
break;
}
}