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

Commit dd9cc9f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Third refactor for BasePermission."

parents 8aaed30d 7b6dc8af

services/core/java/com/android/server/pm/permission/BasePermission.java

+171 −173

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                final SystemConfig.PermissionEntry perm = permConfig.valueAt(i);

                BasePermission bp = mSettings.getPermissionLocked(perm.name);

                if (bp == null) {

                    bp = new BasePermission(perm.name, "android", BasePermission.TYPE_BUILTIN);

                    bp = new BasePermission(perm.name, "android", BasePermission.TYPE_CONFIG);

                    mSettings.putPermissionLocked(perm.name, bp);

                }

                if (perm.gids != null) {
@@ -3300,7 +3300,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                        PackageParser.SigningDetails.CertCapabilities.PERMISSION);

        final boolean isVendorPrivilegedPermission = bp.isVendorPrivileged();

        final boolean isPrivilegedPermission = bp.isPrivileged() || isVendorPrivilegedPermission;

        final boolean isOemPermission = bp.isOEM();

        final boolean isOemPermission = bp.isOem();

        if (!allowed && (isPrivilegedPermission || isOemPermission) && pkg.isSystem()) {

            final String permissionName = bp.getName();

            // For updated system applications, a privileged/oem permission