From 175d114edae98862e3680ef6058322ee2c6dd81c Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 3 May 2021 23:48:41 -0700
Subject: [PATCH] Use ActivityManagerService global lock in dumpHeap

Bug: 187013484
Test: adb shell am dumpheap
Change-Id: I1d3d8016f228c1ee9aa82edee7550ba3e50843ae
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 9aedf1504df50..d526ebc8e5816 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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) {