diff options
| author | Janis Danisevskis <jdanis@google.com> | 2022-03-03 19:45:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-03 19:45:35 +0000 |
| commit | e2f9eb55462e4b6751f028b8fc45f4908c61e745 (patch) | |
| tree | 92c57fb2d80f42be12d5e4d47b052ac26f7ff5b9 | |
| parent | 13db0aa8d386c74b90ad58a1c777e07de058b521 (diff) | |
| parent | cdd0f4b095eb71c932a7ecb18eb5827343724889 (diff) | |
| download | keymaster-e2f9eb55462e4b6751f028b8fc45f4908c61e745.tar.gz | |
KeyMint: CreateKeyMintDevice retruns shared_ptr. am: 99e4a381a1 am: 05d5e5fea0 am: 265c6e55a3 am: cdd0f4b095
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2005013
Change-Id: Ie72e25db84da9c57a67f6ffd08c199cbb3ba3ee2
| -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 |