Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal"

2023-06-28 18:08:51 +00:00
parent 79572ee42e c6c7d0405c
commit 73218d881a
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PreferredActivityHelper.java
+++ b/services/core/java/com/android/server/pm/PreferredActivityHelper.java
@@ -649,6 +649,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)) {