| commit | b2b39ab979e3fc72671b38a6644bc421dd8fdb69 | [log] [tgz] |
|---|---|---|
| author | Frederick Mayle <fmayle@google.com> | Tue Mar 29 21:47:42 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 29 21:47:42 2022 +0000 |
| tree | 2f45af1da3c04a942f91e40552967d94a7e50dfa | |
| parent | b84b4063b8b46fe0dce88bf25670f702d14e76b5 [diff] | |
| parent | c9b9f1cf1a45eca3aa5a79fcd26a56c4d09fc73f [diff] |
Merge "keystore: Fix double ownership of ConfirmationListener in test" am: 8945ea98e9 am: 2304e5752b am: c9b9f1cf1a Original change: https://android-review.googlesource.com/c/platform/system/security/+/2048044 Change-Id: I5fa4dce5d3662ede0e9ed3e1805aa02e508fdcc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp index 1e9126d..d01c67d 100644 --- a/keystore/keystore_cli_v2.cpp +++ b/keystore/keystore_cli_v2.cpp
@@ -1025,7 +1025,7 @@ return 1; } - auto listener = std::make_shared<ConfirmationListener>(); + auto listener = ndk::SharedRefBase::make<ConfirmationListener>(); auto future = listener->get_future(); auto rc = apcService->presentPrompt(listener, promptText, extraData, locale, uiOptionsAsFlags);