From c6c7d0405c65c48a3ac0c4fc56204258c5534752 Mon Sep 17 00:00:00 2001
From: Wen Zhang <zhangwen8@xiaomi.corp-partner.google.com>
Date: Mon, 26 Jun 2023 11:38:47 +0000
Subject: [Bugfix]avoid NPE when getPreferredActivitiesInternal

Bug:288846795
Test: MTBF

Change-Id: Ia5a5c89df4bc6bd24b87d19ce11d66c3bc934a62
---
 services/core/java/com/android/server/pm/PreferredActivityHelper.java | 1 +
 1 file changed, 1 insertion(+)

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)) {
-- 
cgit v1.2.3-59-g8ed1b