From 827ebe7f15d39fa65cf3172df3cdb01347384ad8 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Wed, 9 Jun 2021 16:40:26 -0700
Subject: [PATCH] Fix NullPointerException in ActiveServices

The ProcessRecord field of a ServiceRecord could be null.

Bug: 190634592
Test: atest CtsAppTestCases:ServiceTest
Change-Id: I63abf5be600991a94e6ad4eb26786450cea1e242
---
 services/core/java/com/android/server/am/ActiveServices.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index afaddd9c418ed..458a286381fc4 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -4865,7 +4865,8 @@ public final class ActiveServices {
                 Slog.w(TAG, "Service crashed " + sr.crashCount
                         + " times, stopping: " + sr);
                 EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH,
-                        sr.userId, sr.crashCount, sr.shortInstanceName, sr.app.getPid());
+                        sr.userId, sr.crashCount, sr.shortInstanceName,
+                        sr.app != null ? sr.app.getPid() : -1);
                 bringDownServiceLocked(sr, true);
             } else if (!allowRestart
                     || !mAm.mUserController.isUserRunning(sr.userId, 0)) {