diff options
| author | 2019-05-21 15:27:04 +0000 | |
|---|---|---|
| committer | 2019-05-21 15:27:04 +0000 | |
| commit | c9a18c08dfeb32c52e8e00a7d4a440b5e48d886c (patch) | |
| tree | f46b13bb1f34c40e0df76441182471673424fc0c | |
| parent | ac9d572269833829218a10df898c69e805f4a414 (diff) | |
| parent | d6b849c56dae62b8cbf27647e3d35689554c5c65 (diff) | |
Merge "Allow to grant soft restricted permissions" into qt-dev
| -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": [ { |