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

Merge "Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d881a am: 8130300dd5 am: 2729555205" into udc-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-06-28 20:30:48 +00:00
committed by Android (Google) Code Review
parent 37486f5967 fa17e47d58
commit 1115ec6d6d
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/pm/PreferredActivityHelper.java
View File

@@ -661,6 +661,7 @@ final class PreferredActivityHelper {
final Iterator<PreferredActivity> it = pir.filterIterator(); final Iterator<PreferredActivity> it = pir.filterIterator();
while (it.hasNext()) { while (it.hasNext()) {
final PreferredActivity pa = it.next(); final PreferredActivity pa = it.next();
if (pa == null) continue;
final String prefPackageName = pa.mPref.mComponent.getPackageName(); final String prefPackageName = pa.mPref.mComponent.getPackageName();
if (packageName == null if (packageName == null
|| (prefPackageName.equals(packageName) && pa.mPref.mAlways)) { || (prefPackageName.equals(packageName) && pa.mPref.mAlways)) {