From c0aebc6ba154f5e912ca413796d139008bd4b466 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Wed, 19 Jun 2019 12:58:48 -0700
Subject: [PATCH] Propagate whitelisted perms during install

Before there were only two choices: All or none

Fixes: 135618953
Test: atest CtsPermission2TestCases:android.permission2.cts.RestrictedPermissionsTest
Change-Id: I0989cb2c303bf508674042a2a07fbddec3e5be64
---
 .../core/java/com/android/server/pm/PackageManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 5f4d113601602..3626f8abf5b35 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1507,7 +1507,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,