From d6b849c56dae62b8cbf27647e3d35689554c5c65 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Wed, 15 May 2019 16:36:32 -0700
Subject: [PATCH] Allow to grant soft restricted permissions

Test: atest CtsPermission2TestCases:android.permission2.cts.RestrictedPermissionsTest#testCanGrantSoftRestrictedNotWhitelistedPermissions
Bug: 132737426
Change-Id: I5f0883c957b9d6248bfd00add8cb64b4fb119d08
---
 .../pm/permission/PermissionManagerService.java |  2 +-
 .../android/server/pm/permission/TEST_MAPPING   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

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 b2ba2904cabcd..2b7691b87de94 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 ff7c699eb1307..9efb6692e3737 100644
--- 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": [