diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/TEST_MAPPING | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index b2ba2904cabc..2b7691b87de9 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -2091,7 +2091,7 @@ public class PermissionManagerService { return; } - if (bp.isHardOrSoftRestricted() + if (bp.isHardRestricted() && (flags & PackageManager.FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) == 0) { Log.e(TAG, "Cannot grant restricted non-exempt permission " + permName + " for package " + packageName); diff --git a/services/core/java/com/android/server/pm/permission/TEST_MAPPING b/services/core/java/com/android/server/pm/permission/TEST_MAPPING index ff7c699eb130..9efb6692e373 100644 --- a/services/core/java/com/android/server/pm/permission/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/permission/TEST_MAPPING @@ -29,6 +29,23 @@ ] }, { + "name": "CtsPermission2TestCases", + "options": [ + { + "include-filter": "android.permission.cts.SharedUidPermissionsTest" + }, + { + "include-filter": "android.permission.cts.RestrictedPermissionsTest" + }, + { + "include-filter": "android.permission.cts.PermissionMaxSdkVersionTest" + }, + { + "include-filter": "android.permission.cts.PrivappPermissionsTest" + } + ] + }, + { "name": "CtsStatsdHostTestCases", "options": [ { |