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

Commit 48214a0b authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

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

Merge "Merge "Allow to grant soft restricted permissions" into qt-dev am: c9a18c08 am: 0ae858bb" into qt-r1-dev-plus-aosp
am: 925bd322

Change-Id: Icf1e10119e84c427e1f6df54f7b9f9771266d5a0
parents 6c28f1ff 925bd322

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2105,7 +2105,7 @@ public class PermissionManagerService { 
            return;

            return;

        }

        }





        if (bp.isHardOrSoftRestricted()

        if (bp.isHardRestricted()

                && (flags & PackageManager.FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) == 0) {

                && (flags & PackageManager.FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) == 0) {

            Log.e(TAG, "Cannot grant restricted non-exempt permission "

            Log.e(TAG, "Cannot grant restricted non-exempt permission "

                    + permName + " for package " + packageName);

                    + permName + " for package " + packageName);

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

+17 −0
Original line number Original line 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",

            "name": "CtsStatsdHostTestCases",

            "options": [

            "options": [