| commit | c9b9f1cf1a45eca3aa5a79fcd26a56c4d09fc73f | [log] [tgz] |
|---|---|---|
| author | Frederick Mayle <fmayle@google.com> | Tue Mar 29 21:26:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 29 21:26:09 2022 +0000 |
| tree | 0b62575a5ceec8e137653a5daf705645e86a15be | |
| parent | bb84be2f632d9c76b36e598f1618d6394b1e9f63 [diff] | |
| parent | 2304e5752b321c5a9b44c4506c62c2026d509f83 [diff] |
Merge "keystore: Fix double ownership of ConfirmationListener in test" am: 8945ea98e9 am: 2304e5752b Original change: https://android-review.googlesource.com/c/platform/system/security/+/2048044 Change-Id: I12649e4f784f98df23d4e9c015cff9e29607ccd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore/tests/confirmationui_invocation_test.cpp b/keystore/tests/confirmationui_invocation_test.cpp index 7f8a373..822e6a4 100644 --- a/keystore/tests/confirmationui_invocation_test.cpp +++ b/keystore/tests/confirmationui_invocation_test.cpp
@@ -55,7 +55,7 @@ std::string locale("en"); std::vector<uint8_t> extraData{0xaa, 0xff, 0x00, 0x55}; - auto listener = std::make_shared<ConfirmationListener>(); + auto listener = ndk::SharedRefBase::make<ConfirmationListener>(); auto future = listener->get_future();