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

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

Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed... 

Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
parents 18946328 4a601f97

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

+20 −11
Original line number Diff line number Diff line
@@ -1646,9 +1646,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
            }















            // Now that we successfully installed the package, grant runtime













            // permissions if requested before broadcasting the install.













            if (grantPermissions && res.pkg.applicationInfo.targetSdkVersion













                    >= Build.VERSION_CODES.M) {













            // permissions if requested before broadcasting the install. Also













            // for legacy apps in permission review mode we clear the permission













            // review flag which is used to emulate runtime permissions for













            // legacy apps.













            if (grantPermissions) {















                grantRequestedRuntimePermissions(res.pkg, res.newUsers, grantedPermissions);















            }
























@@ -1885,11 +1887,6 @@ public class PackageManagerService extends IPackageManager.Stub {













        for (int userId : userIds) {















            grantRequestedRuntimePermissionsForUser(pkg, userId, grantedPermissions);















        }

























        // We could have touched GID membership, so flush out packages.list













        synchronized (mPackages) {













            mSettings.writePackageListLPr();













        }















    }





























    private void grantRequestedRuntimePermissionsForUser(PackageParser.Package pkg, int userId,









@@ -1904,6 +1901,9 @@ public class PackageManagerService extends IPackageManager.Stub {













        final int immutableFlags = PackageManager.FLAG_PERMISSION_SYSTEM_FIXED















                | PackageManager.FLAG_PERMISSION_POLICY_FIXED;



























        final boolean supportsRuntimePermissions = pkg.applicationInfo.targetSdkVersion













                >= Build.VERSION_CODES.M;



























        for (String permission : pkg.requestedPermissions) {















            final BasePermission bp;















            synchronized (mPackages) {









@@ -1913,10 +1913,19 @@ public class PackageManagerService extends IPackageManager.Stub {













                    && (grantedPermissions == null















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















                final int flags = permissionsState.getPermissionFlags(permission, userId);













                if (supportsRuntimePermissions) {















                    // Installer cannot change immutable permissions.















                    if ((flags & immutableFlags) == 0) {















                        grantRuntimePermission(pkg.packageName, permission, userId);















                    }













                } else if (mPermissionReviewRequired) {













                    // In permission review mode we clear the review flag when we













                    // are asked to install the app with all permissions granted.













                    if ((flags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {













                        updatePermissionFlags(permission, pkg.packageName,













                                PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED, 0 /*value*/, userId);













                    }













                }















            }















        }















    }