Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I73a7e4e63a1745ff8e331d9c9a20ce06258f051d
This commit is contained in:
Jing Ji
2020-04-07 02:37:09 +00:00
committed by Automerger Merge Worker
parent 36371a5d13 1f70f0a5c6
commit 1e4a17b5d6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -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;