commit 62f2bd0e41c7d0b5eea78dc0293e205d4cc34187
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 03 18:36:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 03 18:36:42 2022 +0000
tree 87562ee0d8b47edfb944004f7c343ef690b9744e
parent c7e6fcd2a49f0d312835764e6ad2cf2c4ac65a8f
parent 99ad4f31c5b6a41dd663f67d83bbb999c5120b18

Merge "Keystore 2.0: km_compat: Fix ref counting in software keymint device." am: 99ad4f31c5

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2005060

Change-Id: I8bbf321498d25aca1d427d930dba0204391f704b

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 0775f2f..3db1a9f 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -1420,7 +1420,7 @@
         setNumFreeSlots(15);
     }
 
-    softKeyMintDevice_.reset(CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE));
+    softKeyMintDevice_ = CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE);
 }
 
 sp<Keymaster> getDevice(KeyMintSecurityLevel securityLevel) {
@@ -1448,7 +1448,7 @@
     static std::shared_ptr<IKeyMintDevice> swDevice;
     std::lock_guard<std::mutex> lock(mutex);
     if (!swDevice) {
-        swDevice.reset(CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE));
+        swDevice = CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE);
     }
     return swDevice;
 }