| commit | 6fdf74990aee96a30d392c007fd37335e2367f4c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 31 22:43:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 31 22:43:11 2022 +0000 |
| tree | 38036051701d8954196486da9f70548a34e930f4 | |
| parent | b2b39ab979e3fc72671b38a6644bc421dd8fdb69 [diff] | |
| parent | a456d24679c63e0f23c3c828917aa37867468f48 [diff] |
Merge changes from topic "legacy_blob_tests" am: 7de12b5730 am: c668680e36 am: a456d24679 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2048043 Change-Id: I0a9087d6d838a598686b5f2bf3f1ee48d52c4033 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);