Merge "Allow to grant soft restricted permissions" into qt-dev

am: c9a18c08df Change-Id: Ic434e0f5d5e48245dc854f69cf403403eb621990
2019-05-21 08:41:47 -07:00
parent deac4709db c9a18c08df
commit 0ae858bbc4
2 changed files with 18 additions and 1 deletions
--- 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);
--- a/services/core/java/com/android/server/pm/permission/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/permission/TEST_MAPPING
@@ -28,6 +28,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": [