From 3d43f63a9f3d4f3e01eb9ea9dd04123f785d07dd Mon Sep 17 00:00:00 2001
From: Eghosa Ewansiha-Vlachavas <eevlachavas@google.com>
Date: Wed, 21 Sep 2022 10:06:14 +0000
Subject: [PATCH] Replace isChangeEnabled() package name argument.

In DPMS.setKeyGrantForApp() the isChangeEnabled() method call takes the
wrong argument. Should take "callerPackage" variable not the
"packageName" variable.

Fixes: 247969365
Test: atest KeyManagementTest#grantKeyPairToApp_nonExistent_throwsIllegalArgumentException
Change-Id: Ifab8b1c980e7a5a63037b9a8da268ae367e706ff
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index bb6bd4aa1bbc3..42dfee375ae44 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5725,7 +5725,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
         try {
             return setKeyChainGrantInternal(alias, hasGrant, granteeUid, caller.getUserHandle());
         } catch (IllegalArgumentException e) {
-            if (mInjector.isChangeEnabled(THROW_EXCEPTION_WHEN_KEY_MISSING, packageName,
+            if (mInjector.isChangeEnabled(THROW_EXCEPTION_WHEN_KEY_MISSING, callerPackage,
                     caller.getUserId())) {
                 throw e;
             }