commit 99681358209a207207e39467276fe2283c70c7ee
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Sep 29 23:31:03 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Sep 29 23:31:03 2022 +0000
tree 7592c14417d0117cee87ac9412c8db2d8bd1d411
parent 1af292acd92cc4240db9e0a17cc1ed5f04cf8721
parent a246eae3f486ff5bc54c053720a12fa5c3291c45

Snap for 9121707 from a246eae3f486ff5bc54c053720a12fa5c3291c45 to tm-qpr1-release

Change-Id: Iaa95022255152a74ad089e7ccc2ad6e8a77d0c1f

keystore2/src/km_compat/km_compat.cpp

diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp
index 6d0630b..d513db0 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -574,6 +574,17 @@
     auto legacyUpgradeParams = convertKeyParametersToLegacy(in_inUpgradeParams);
     V4_0_ErrorCode errorCode;
 
+    if (prefixedKeyBlobIsSoftKeyMint(in_inKeyBlobToUpgrade)) {
+        auto status = softKeyMintDevice_->upgradeKey(
+            prefixedKeyBlobRemovePrefix(in_inKeyBlobToUpgrade), in_inUpgradeParams, _aidl_return);
+        if (!status.isOk()) {
+            LOG(ERROR) << __func__ << " transaction failed. " << status.getDescription();
+        } else {
+            *_aidl_return = keyBlobPrefix(*_aidl_return, true);
+        }
+        return status;
+    }
+
     auto result =
         mDevice->upgradeKey(prefixedKeyBlobRemovePrefix(in_inKeyBlobToUpgrade), legacyUpgradeParams,
                             [&](V4_0_ErrorCode error, const hidl_vec<uint8_t>& upgradedKeyBlob) {