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

Commit 66923936 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Propagate whitelisted perms during install" into qt-dev am: ddaa6e59 am: e90e7dee 

am: 7fba6691

Change-Id: Ibf0bab547ca14905a35d64c94aca1fe319c1bb40
parents 050e9637 7fba6691

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

+2 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                        final List<String> whitelistedRestrictedPermissions = ((args.installFlags

                                & PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS) != 0

                                    && parentRes.pkg != null)

                                ? parentRes.pkg.requestedPermissions : null;

                                ? parentRes.pkg.requestedPermissions

                                : args.whitelistedRestrictedPermissions;















                        // Handle the parent package















                        handlePackagePostInstall(parentRes, grantPermissions,