Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31d1f1d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Another setting.pkg null check" into rvc-dev am: 171f5f28 am: ca3cc25e am: 40b310c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940

Change-Id: I4513939ead4500ce06640772d7e2f0dcfc9216e0
parents a9b678df 40b310c7

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

+1 −1
Original line number Diff line number Diff line
@@ -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);