Merge "Fix NullPointerException in ActiveService" into rvc-dev am: b7b84697fd

Change-Id: Ie007c401f04fc118ae1f8d63bade1cf68a62250f
2020-04-07 02:16:42 +00:00
parent ffca079c19 b7b84697fd
commit 1f70f0a5c6
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;