Merge "Do enforcement check before granted check" (6175bf40) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -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-<product>.xml file for package "
		+ " should be declared in "
		+ "/etc/permissions/privapp-permissions-platform.xml "
		+ "or privapp-permissions-<device>.xml file for package "
		+ packageName,
		privAppPermissions.contains(pName));
		}
		assertTrue("Permission " + pName + " should be granted to " + packageName, granted);
		}
		}
		}