From 622438feba14e527d464e4e0c8006c2e8b8e4e9e Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 6 Apr 2020 17:31:31 -0700
Subject: [PATCH] Fix NullPointerException in ActiveService

Bug: 151985835
Test: Manual
Change-Id: Ib9e8a39e8cc07cccb12727e98efcc280d13852ab
---
 services/core/java/com/android/server/am/ActiveServices.java | 2 +-
 1 file changed, 1 insertion(+), 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 7523710dde9fe..21760cdf02eba 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1440,7 +1440,7 @@ public final class ActiveServices {
                                 active.mPackageName = r.packageName;
                                 active.mUid = r.appInfo.uid;
                                 active.mShownWhileScreenOn = mScreenOn;
-                                if (r.app != null) {
+                                if (r.app != null && r.app.uidRecord != null) {
                                     active.mAppOnTop = active.mShownWhileTop =
                                             r.app.uidRecord.getCurProcState()
                                                     <= ActivityManager.PROCESS_STATE_TOP;