Merge "Merge "Merge "Allow to grant soft restricted permissions" into qt-dev... (66b3e353) · Commits · e / os / android_frameworks_base

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

+1 −1

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

+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": [