From 6732830b29f18d462892d47dcbc219e15316f203 Mon Sep 17 00:00:00 2001
From: Patrick Baumann <patb@google.com>
Date: Thu, 18 Jun 2020 16:28:34 -0700
Subject: [PATCH] Another setting.pkg null check

We have another case of setting.pkg being accessed without a null check.
This change fixes that error.

Fixes: 159372907
Test: atest AppEnumerationTests AppsFilterTest
Change-Id: I1b60471a8f019cba8f4155107d56838a6fc73c8c
---
 services/core/java/com/android/server/pm/AppsFilter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java
index 9203122617101..8a7702efcba8a 100644
--- a/services/core/java/com/android/server/pm/AppsFilter.java
+++ b/services/core/java/com/android/server/pm/AppsFilter.java
@@ -817,7 +817,7 @@ public class AppsFilter {
                 }
             }
 
-            if (!setting.pkg.getProtectedBroadcasts().isEmpty()) {
+            if (setting.pkg != null && !setting.pkg.getProtectedBroadcasts().isEmpty()) {
                 final String removingPackageName = setting.pkg.getPackageName();
                 final Set<String> protectedBroadcasts = mProtectedBroadcasts;
                 mProtectedBroadcasts = collectProtectedBroadcasts(settings, removingPackageName);