commit 7b3b0611d31416ead42827bf5280a44c573fbb3d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 26 15:59:58 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 26 15:59:58 2020 +0000
tree 1364b7d464d5c8d6a98413d931dd4215304774b6
parent 9a4ec16d7f1a5cd79fd2c7dad79de57482926d93
parent 0bc18b37ac912b5b06aedbbe307ef29c4351b7c9

Merge "Fixes NPE on null pkg" into rvc-dev

services/core/java/com/android/server/pm/AppsFilter.java

diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java
index 830388d..4b6ee71 100644
--- a/services/core/java/com/android/server/pm/AppsFilter.java
+++ b/services/core/java/com/android/server/pm/AppsFilter.java
@@ -446,11 +446,6 @@
             }
         }
 
-        if (!newPkgSetting.pkg.getProtectedBroadcasts().isEmpty()) {
-            mProtectedBroadcasts.addAll(newPkgSetting.pkg.getProtectedBroadcasts());
-            recomputeComponentVisibility(existingSettings, newPkgSetting.pkg.getPackageName());
-        }
-
         Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage");
         try {
             final AndroidPackage newPkg = newPkgSetting.pkg;
@@ -459,6 +454,11 @@
                 return;
             }
 
+            if (!newPkg.getProtectedBroadcasts().isEmpty()) {
+                mProtectedBroadcasts.addAll(newPkg.getProtectedBroadcasts());
+                recomputeComponentVisibility(existingSettings, newPkg.getPackageName());
+            }
+
             final boolean newIsForceQueryable =
                     mForceQueryable.contains(newPkgSetting.appId)
                             /* shared user that is already force queryable */