Merge "Handle renamed packages during default grants" into oc-dev (bfc083c3) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -936,7 +936,7 @@ final class DefaultPermissionGrantPolicy {
		// permissions if the version on the system image does not declare them.
		if (!isDefaultPhoneOrSms && pkg.isUpdatedSystemApp()) {
		PackageSetting sysPs = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName);
		if (sysPs != null) {
		if (sysPs != null && sysPs.pkg != null) {
		if (sysPs.pkg.requestedPermissions.isEmpty()) {
		return;
		}