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

Commit a47f9dad authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Don't try overriding system fixed permissions on install" into mnc-dr-dev

parents cfa233ee 4f7883ce

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

+3 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                BasePermission bp = mSettings.mPermissions.get(permission);

                if (bp != null && (bp.isRuntime() || bp.isDevelopment())

                        && (grantedPermissions == null

                               || ArrayUtils.contains(grantedPermissions, permission))) {

                               || ArrayUtils.contains(grantedPermissions, permission))

                        && (getPermissionFlags(permission, pkg.packageName, userId)

                                & PackageManager.FLAG_PERMISSION_SYSTEM_FIXED) == 0) {

                    grantRuntimePermission(pkg.packageName, permission, userId);

                }

            }