commit 463cef29942862c309ef8f0d4b274ffef236531c
author Tadashi G. Takaoka <takaoka@google.com> Wed Dec 05 15:42:19 2018 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Dec 07 16:14:42 2018 +0900
tree 310d5a05ea7d1e2e345781c454710b3aac405942
parent 132b1c6002a6b5a5742a32852b515421ff95c57d

Fix ActivityManagerAmProfileTests

Before activity profile starts, AMS.clearProfilerLocked() is called
and it calls ProfileData.setProfileProc() with null ProcessRecord. It
causes NPE and activity profile wouldn't start.

Fixes: 119685223
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerAmProfileTests

Change-Id: Ia1aa4fcec840f32d71e0bb632a7f380d8a943f40

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index c16f1db..40da881 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1199,8 +1199,8 @@
         void setProfileProc(ProcessRecord profileProc) {
             mProfileProc = profileProc;
             if (mAtmInternal != null) {
-                mAtmInternal.setProfileProc(
-                        profileProc.getWindowProcessController());
+                mAtmInternal.setProfileProc(profileProc == null ? null
+                        : profileProc.getWindowProcessController());
             }
         }