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

Merge "Use ActivityManagerService global lock in dumpHeap" into sc-dev am: a08dcc7ccb am: 96251c00ca

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

Change-Id: Ifd9e38674978f46dbd9fedd4f6682a6b0514cb38
This commit is contained in:
Jing Ji
2021-05-04 18:36:24 +00:00
committed by Automerger Merge Worker
parent 6baa6dd9f8 96251c00ca
commit 9dfd833495
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14831,7 +14831,7 @@ public class ActivityManagerService extends IActivityManager.Stub
throw new IllegalArgumentException("null fd"); throw new IllegalArgumentException("null fd");
} }
synchronized (mProcLock) { synchronized (this) {
ProcessRecord proc = findProcessLOSP(process, userId, "dumpHeap"); ProcessRecord proc = findProcessLOSP(process, userId, "dumpHeap");
IApplicationThread thread; IApplicationThread thread;
if (proc == null || (thread = proc.getThread()) == null) { if (proc == null || (thread = proc.getThread()) == null) {