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 am: 1115ec6d6d am: f64564c296

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

Change-Id: I5a0fc2fd31b4b3ec2d7d6037a87479c25ea29eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2023-06-28 21:58:36 +00:00
parent ea5b650ec3 f64564c296
commit 72f1f540a8
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();
while (it.hasNext()) {
final PreferredActivity pa = it.next();
if (pa == null) continue;
final String prefPackageName = pa.mPref.mComponent.getPackageName();
if (packageName == null
|| (prefPackageName.equals(packageName) && pa.mPref.mAlways)) {