Merge "Merge "Allow system apps to define ephemeral permissions" into oc-dev... (073a4279) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -17189,10 +17189,10 @@ public class PackageManagerService extends IPackageManager.Stub
		PackageParser.Permission perm = pkg.permissions.get(i);
		BasePermission bp = mSettings.mPermissions.get(perm.info.name);

		// Don't allow anyone but the platform to define ephemeral permissions.
		// Don't allow anyone but the system to define ephemeral permissions.
		if ((perm.info.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0
		&& !PLATFORM_PACKAGE_NAME.equals(pkg.packageName)) {
		Slog.w(TAG, "Package " + pkg.packageName
		&& !systemApp) {
		Slog.w(TAG, "Non-System package " + pkg.packageName
		+ " attempting to delcare ephemeral permission "
		+ perm.info.name + "; Removing ephemeral.");
		perm.info.protectionLevel &= ~PermissionInfo.PROTECTION_FLAG_EPHEMERAL;