commit 34251077a0f9031ea32a05e7381da6196cd66c26
author Brian Young <bcyoung@google.com> Fri Mar 30 17:07:04 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 30 17:07:04 2018 +0000
tree fa9809eada03a1b4529ce323749f2b146cb776bc
parent aef79ae52d8b011f1b96dc53da37e9601ee81cc8
parent 9371e95bb0aa3df0a433c711de071f92be5de4d8

Add "unlocked device required" keystore API
am: 9371e95bb0

Change-Id: If9dd8570d0b7f6ba1594391be9e5283be9a930db

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 8be07f8..13b3df1 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -550,8 +550,11 @@
     hidl_vec<uint8_t> legacy_out;
     KeyStoreServiceReturnCode res =
         doLegacySignVerify(name, data, &legacy_out, hidl_vec<uint8_t>(), KeyPurpose::SIGN);
+    if (!res.isOk()) {
+        return Status::fromServiceSpecificError((res));
+    }
     *out = legacy_out;
-    return Status::fromServiceSpecificError((res));
+    return Status::ok();
 }
 
 Status KeyStoreService::verify(const String16& name, const ::std::vector<uint8_t>& data,

keystore/keystore_cli_v2.cpp

diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp
index 870a548..6377ec1 100644
--- a/keystore/keystore_cli_v2.cpp
+++ b/keystore/keystore_cli_v2.cpp
@@ -502,7 +502,7 @@
     }
 
     if (promptText.size() == 0) {
-        printf("The --promptText parameter cannot be empty.\n");
+        printf("The --prompt_text parameter cannot be empty.\n");
         return 1;
     }
 
@@ -615,7 +615,7 @@
                        command_line->GetSwitchValueASCII("in"),
                        command_line->GetSwitchValueASCII("out"));
     } else if (args[0] == "confirmation") {
-        return Confirmation(command_line->GetSwitchValueASCII("prompt_text"),
+        return Confirmation(command_line->GetSwitchValueNative("prompt_text"),
                             command_line->GetSwitchValueASCII("extra_data"),
                             command_line->GetSwitchValueASCII("locale"),
                             command_line->GetSwitchValueASCII("ui_options"),