Merge "Propagate whitelisted perms during install" into qt-dev

am: ddaa6e5943 Change-Id: I861d3a91cabc9655b4c1ef366f1d9510ee247b4c
2019-06-19 19:16:35 -07:00
parent 302a2ecb05 ddaa6e5943
commit 383a69c01f
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1505,7 +1505,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,