Fix NullPointerException in ActiveService

Bug: 151985835 Test: Manual Change-Id: Ib9e8a39e8cc07cccb12727e98efcc280d13852ab
2020-04-06 17:31:31 -07:00
parent 2de79fb6fd
commit 622438feba
1 changed files with 1 additions and 1 deletions
--- 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;