Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dfd8334 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Use ActivityManagerService global lock in dumpHeap" into sc-dev am:... 

Merge "Use ActivityManagerService global lock in dumpHeap" into sc-dev am: a08dcc7c am: 96251c00

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

Change-Id: Ifd9e38674978f46dbd9fedd4f6682a6b0514cb38
parents 6baa6dd9 96251c00

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -14831,7 +14831,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                throw new IllegalArgumentException("null fd");

            }













            synchronized (mProcLock) {













            synchronized (this) {















                ProcessRecord proc = findProcessLOSP(process, userId, "dumpHeap");















                IApplicationThread thread;















                if (proc == null || (thread = proc.getThread()) == null) {