Snap for 4920102 from 6c7eb3eb68de6bc7b3b826b1aaadb8fc35efed3f to pi-qpr1-releaseandroid-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-release

Change-Id: Ia60f0ccd6a5888eedd4bb7bcdd009fefb53cfcb4

1 files changed, 0 insertions, 30 deletions

diff --git a/hals/keymaster/citadel/service.cpp b/hals/keymaster/citadel/service.cpp
index 89f4e8e..8561bbf 100644
--- a/hals/keymaster/citadel/service.cpp
+++ b/hals/keymaster/citadel/service.cpp
@@ -48,35 +48,6 @@ using ::android::hardware::keymaster::V4_0::ErrorCode;
 
 using KeymasterClient = ::nugget::app::keymaster::Keymaster;
 
-// TODO(ngm): move this code into the HAL implementation.
-static bool provisionStatus(KeymasterClient *keymasterClient) {
-    ProvisionPresharedSecretRequest request;
-    ProvisionPresharedSecretResponse response;
-    request.set_get_status(true);
-
-    const uint32_t status = keymasterClient->ProvisionPresharedSecret(
-        request, &response);
-    if (status != APP_SUCCESS) {
-        LOG(ERROR) << "ProvisionPresharedSecret(get_status) failed with status: "
-                   << ::nos::StatusCodeString(status);
-        return false;
-    }
-    const ErrorCode error_code = translate_error_code(response.error_code());
-    if (error_code != ErrorCode::OK) {
-        LOG(ERROR) << "ProvisionPresharedSecret(get_status) response error code: "
-                   << toString(error_code);
-        return false;
-    }
-    if (response.status() == PresharedSecretStatus::ALREADY_SET) {
-        LOG(INFO) << "Preshared secret previously provisioned";
-        return true;
-    } else {
-        LOG(WARNING) << "Preshared secret unprovisioned";
-        return false;
-    }
-
-}
-
 int main() {
     LOG(INFO) << "Keymaster HAL service starting";
 
@@ -95,7 +66,6 @@ int main() {
     KeymasterClient keymasterClient{citadeldProxy};
     sp<KeymasterDevice> keymaster = new KeymasterDevice{keymasterClient};
 
-    provisionStatus(&keymasterClient);
     const status_t status = keymaster->registerAsService("strongbox");
     if (status != OK) {
         LOG(FATAL) << "Failed to register Keymaster as a service (status: "