summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stuart Scott <stuartscott@google.com> 2016-09-22 08:03:03 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-22 08:03:03 +0000
commitb15c45a037cc4e43a879cbb33dacb70b0150ab4a (patch)
treeabe55bdf0dfb0d5753be917bb3fd90d674541f5c
parent1f52dcc543d60763d73a5b81efdd3e9a2c3b8e2a (diff)
parent0845b025aad0ace454e0530b9217b7af72a42d34 (diff)
Continue if package is not in system am: 434c8db80f
am: 0845b025aa Change-Id: Id87f7ab2c549d176d82fbcf18479671320a74616
-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 8e44570e8e06..33c297d2c907 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -1084,7 +1084,7 @@ final class DefaultPermissionGrantPolicy {
if (pkg == null) {
Log.w(TAG, "Unknown package:" + packageName);
XmlUtils.skipCurrentTag(parser);
- return;
+ continue;
}
// The package must support runtime permissions
@@ -1092,7 +1092,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);