Merge "Fixes crash when provider has null authorities"

2020-02-21 16:06:13 +00:00
parent 7f66d5f1b3 a7479cc607
commit b3156d400e
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/AppsFilter.java
+++ b/services/core/java/com/android/server/pm/AppsFilter.java
@@ -247,6 +247,9 @@ public class AppsFilter {
            if (!provider.isExported()) {
                continue;
            }
+            if (provider.getAuthority() == null) {
+                continue;
+            }
            StringTokenizer authorities = new StringTokenizer(provider.getAuthority(), ";",
                    false);
            while (authorities.hasMoreElements()) {