Merge "System package permission decls take precedence over 3rd party apps'" into klp-dev (c157cac9) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -4959,6 +4959,18 @@ public class PackageManagerService extends IPackageManager.Stub {
		permissionMap.put(p.info.name, bp);
		}
		if (bp.perm == null) {
		if (bp.sourcePackage != null
		&& !bp.sourcePackage.equals(p.info.packageName)) {
		// If this is a permission that was formerly defined by a non-system
		// app, but is now defined by a system app (following an upgrade),
		// discard the previous declaration and consider the system's to be
		// canonical.
		if (isSystemApp(p.owner)) {
		Slog.i(TAG, "New decl " + p.owner + " of permission "
		+ p.info.name + " is system");
		bp.sourcePackage = null;
		}
		}
		if (bp.sourcePackage == null
		\|\| bp.sourcePackage.equals(p.info.packageName)) {
		BasePermission tree = findPermissionTreeLP(p.info.name);