From 7ce2715fa7e7de7a2d072dee2f5384b477211af9 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Thu, 3 Jun 2021 13:46:44 -0700
Subject: [PATCH] Set the pid of ProcessProfileRecord for system_server

Bug: 190084282
Test: Manual - Capture system heap dump, verify notification is posted
Change-Id: I53e05a644280add45b268c96bdcc74727e4f8ca3
---
 .../java/com/android/server/am/ActivityManagerService.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 6e500e4ea5ea5..1d4f251bd787c 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1804,8 +1804,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                         0,
                         new HostingRecord("system"));
                 app.setPersistent(true);
-                app.mPid = MY_PID;
-                app.getWindowProcessController().setPid(MY_PID);
+                app.setPid(MY_PID);
                 app.mState.setMaxAdj(ProcessList.SYSTEM_ADJ);
                 app.makeActive(mSystemThread.getApplicationThread(), mProcessStats);
                 addPidLocked(app);