From 7bfe074c7852cc16af2952f9ac0f17359bb7a7c3 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Thu, 8 Dec 2016 15:53:39 -0800 Subject: [PATCH] Do enforcement check before granted check The enforcement assertion provides better explanation of the problem and fix instructions. Test: Removed permission from a privapp xml and verified that test fails Bug: 31008485 Change-Id: I58454d1b38722a232764dea14ebe2e4ada09e24f --- .../com/android/server/pm/PackageManagerPresubmitTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java index 1188bb780fa93..5c552a2437c1c 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java @@ -100,16 +100,17 @@ public class PackageManagerPresubmitTest { if ((protectionLevel & PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0) { boolean granted = (packageInfo.requestedPermissionsFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0; - assertTrue("Permission " + pName + " should be granted to " + packageName, granted); // if privapp permissions are enforced, platform permissions must be whitelisted // in SystemConfig if (platformPermission && RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) { assertTrue("Permission " + pName - + " should be declared in privapp-permissions-platform.xml " - + "or privapp-permissions-.xml file for package " + + " should be declared in " + + "/etc/permissions/privapp-permissions-platform.xml " + + "or privapp-permissions-.xml file for package " + packageName, privAppPermissions.contains(pName)); } + assertTrue("Permission " + pName + " should be granted to " + packageName, granted); } } }