diff options
| author | Janis Danisevskis <jdanis@google.com> | 2022-03-03 19:00:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-03 19:00:12 +0000 |
| commit | 265c6e55a39a97b4346f61943009c61a85c45d73 (patch) | |
| tree | f33d4b4bf59ecac5baca45a49d863c541cc65a4e | |
| parent | 44f581279c0b4e59e4c76415398efa263b40d318 (diff) | |
| parent | 05d5e5fea02edd701b5f8109c84c325f9cfbab33 (diff) | |
| download | keymaster-265c6e55a39a97b4346f61943009c61a85c45d73.tar.gz | |
KeyMint: CreateKeyMintDevice retruns shared_ptr. am: 99e4a381a1 am: 05d5e5fea0
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2005013
Change-Id: I0f2c7c08375642cd5b9f7776d78ad702ca7b6ff9
| -rw-r--r-- | ng/AndroidKeyMintDevice.cpp | 4 | ||||
| -rw-r--r-- | ng/include/AndroidKeyMintDevice.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp index 373ec03..9d2cc69 100644 --- a/ng/AndroidKeyMintDevice.cpp +++ b/ng/AndroidKeyMintDevice.cpp @@ -492,8 +492,8 @@ ScopedAStatus AndroidKeyMintDevice::sendRootOfTrust(const vector<uint8_t>& /* ro return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED); } -IKeyMintDevice* CreateKeyMintDevice(SecurityLevel securityLevel) { - return ::new AndroidKeyMintDevice(securityLevel); +std::shared_ptr<IKeyMintDevice> CreateKeyMintDevice(SecurityLevel securityLevel) { + return ndk::SharedRefBase::make<AndroidKeyMintDevice>(securityLevel); } } // namespace aidl::android::hardware::security::keymint diff --git a/ng/include/AndroidKeyMintDevice.h b/ng/include/AndroidKeyMintDevice.h index b1b27cb..06557be 100644 --- a/ng/include/AndroidKeyMintDevice.h +++ b/ng/include/AndroidKeyMintDevice.h @@ -94,6 +94,6 @@ class AndroidKeyMintDevice : public BnKeyMintDevice { SecurityLevel securityLevel_; }; -IKeyMintDevice* CreateKeyMintDevice(SecurityLevel securityLevel); +std::shared_ptr<IKeyMintDevice> CreateKeyMintDevice(SecurityLevel securityLevel); } // namespace aidl::android::hardware::security::keymint |