summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Scott <stuartscott@google.com>2016-09-21 14:04:22 -0700
committergitbuildkicker <android-build@google.com>2016-09-21 19:41:48 -0700
commitef2342c735f69ca4a87a6eec6ebd073f876a127c (patch)
tree97bc32f405753c8485cac689c86c78dff86659a3
parent09308edb19c670760977ae156a5ce4222afda665 (diff)
downloadbase-ef2342c735f69ca4a87a6eec6ebd073f876a127c.tar.gz
Continue if package is not in systemandroid-7.1.0_r3
bug:29546655 Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2 (cherry picked from commit 434c8db80f39d75a76152cd9820769703a5bd9d4)
-rw-r--r--services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index d1dbdd8b1945..ded85f3da3d6 100644
--- 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);