Merge "Do not cache rkp_only property" am: 4c348bd49f am: fb4ccc3172 am: 2fcd798bc9
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2070036
Change-Id: Ie43d58a109b751b1c84ae6fa0ead319488193422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/identity/Android.bp b/identity/Android.bp
index c69ead1..b3b704f 100644
--- a/identity/Android.bp
+++ b/identity/Android.bp
@@ -59,7 +59,7 @@
],
static_libs: [
"android.hardware.identity-V4-cpp",
- "android.hardware.keymaster-V4-cpp",
+ "android.hardware.keymaster-V3-cpp",
"libcppbor_external",
],
}
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);