Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2317bfc6 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Handle renamed packages during default grants" into oc-dev am: bfc083c3 

am: 7e05bb77

Change-Id: Ib4e3b2799c2a104fd203b6e64e86d6181567b177
parents 4f64bd56 7e05bb77

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;

                }