Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857

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

Change-Id: I0ee7d008075aa0ac167934a36a13ba6490bc7854
This commit is contained in:
TreeHugger Robot
2020-06-19 16:29:33 +00:00
committed by Automerger Merge Worker
parent 740ab27cde 171f5f2857
commit 38c4e953df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -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 String removingPackageName = setting.pkg.getPackageName();
final Set<String> protectedBroadcasts = mProtectedBroadcasts; final Set<String> protectedBroadcasts = mProtectedBroadcasts;
mProtectedBroadcasts = collectProtectedBroadcasts(settings, removingPackageName); mProtectedBroadcasts = collectProtectedBroadcasts(settings, removingPackageName);