Merge "Continue if package is not in system" into nyc-dr1-dev

2016-09-21 22:58:53 +00:00
parent 60d2af330b 434c8db80f
commit cffe1f48d3
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -1069,7 +1069,7 @@ final class DefaultPermissionGrantPolicy {
                    if (pkg == null) {
                        Log.w(TAG, "Unknown package:" + packageName);
                        XmlUtils.skipCurrentTag(parser);
-                        return;
+                        continue;
                    }

                    // The package must support runtime permissions
@@ -1077,7 +1077,7 @@ final class DefaultPermissionGrantPolicy {
                        Log.w(TAG, "Skipping non supporting runtime permissions package:"
                                + packageName);
                        XmlUtils.skipCurrentTag(parser);
-                        return;
+                        continue;
                    }
                    packageExceptions = new ArrayList<>();
                    outGrantExceptions.put(packageName, packageExceptions);