Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b849c5 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Allow to grant soft restricted permissions 

Test: atest CtsPermission2TestCases:android.permission2.cts.RestrictedPermissionsTest#testCanGrantSoftRestrictedNotWhitelistedPermissions
Bug: 132737426
Change-Id: I5f0883c957b9d6248bfd00add8cb64b4fb119d08
parent f36fee3c

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/pm/permission/TEST_MAPPING

+17 −0
Original line number Diff line number Diff line
@@ -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": [