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

Commit 023f4d15 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

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

am: c4c18662

* commit 'c4c18662':
  Don't try overriding system fixed permissions on install
parents 6423c0a2 c4c18662

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);

                }

            }