Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d4e27d authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException in ActiveService" into rvc-dev am: b7b84697 am: 1f70f0a5 

Change-Id: I520759281cadec2f671ee0926079a65a88847f84
parents 693d1d92 1f70f0a5

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

+1 −1
Original line number Diff line number Diff line
@@ -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;