diff options
| author | 2023-06-28 18:40:34 +0000 | |
|---|---|---|
| committer | 2023-06-28 18:40:34 +0000 | |
| commit | 8130300dd5e626f0d302cc5fded7d9bb25a00c4f (patch) | |
| tree | 7536613314994102c0f21a7474fe38333a12391e | |
| parent | fbaae95af61ed2b3a4cd4e48bfec6939a1d5e996 (diff) | |
| parent | 73218d881a5be9a0498ec47ef2e1b68955a1e7b9 (diff) | |
Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d881a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2635751
Change-Id: I9f71802da102a85adb49b0a8a9ca84caad579b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/PreferredActivityHelper.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PreferredActivityHelper.java b/services/core/java/com/android/server/pm/PreferredActivityHelper.java index 2b092b9a257c..8655d0d8deed 100644 --- 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)) { |