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

Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d881a am: 8130300dd5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2635751

Change-Id: I2fcaf11632efa1a5d31a9adbde349040416319dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2023-06-28 19:43:09 +00:00
committed by Automerger Merge Worker
parent 52644bc496 8130300dd5
commit 2729555205
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

@@ -649,6 +649,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)) {