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

Commit 5256fb75 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Fix NullPointerException in ActiveService" into rvc-dev am: b7b84697 am: 1f70f0a5" into rvc-d1-dev-plus-aosp
parents 24e6060d 54d4e27d

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;