Add error logging in GetRootOfTrustandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android13-tests-releaseandroid13-tests-devandroid13-dev

Bug: 219076736
Test: VtsAidlKeyMintTargetTest
Ignore-AOSP-First: Cherry pick from AOSP
Change-Id: I9670bc63fb7d9e2c2091357f16bea27e8e3331bf
(cherry picked from commit 63bf7285d48413c10b5833d2c9b4438b78c29a4d)

1 files changed, 7 insertions, 1 deletions

diff --git a/android_keymaster/android_keymaster.cpp b/android_keymaster/android_keymaster.cpp
index 828dead..420bbf2 100644
--- a/android_keymaster/android_keymaster.cpp
+++ b/android_keymaster/android_keymaster.cpp
@@ -942,21 +942,27 @@ GetRootOfTrustResponse AndroidKeymaster::GetRootOfTrust(const GetRootOfTrustRequ
     GetRootOfTrustResponse response(message_version());
 
     if (!context_->attestation_context()) {
+        LOG_E("Have no attestation context, cannot get RootOfTrust", 0);
         response.error = KM_ERROR_UNIMPLEMENTED;
         return response;
     }
 
     const AttestationContext::VerifiedBootParams* vbParams =
         context_->attestation_context()->GetVerifiedBootParams(&response.error);
-    if (response.error != KM_ERROR_OK) return response;
+    if (response.error != KM_ERROR_OK) {
+        LOG_E("Error retrieving verified boot params: %lu", response.error);
+        return response;
+    }
 
     auto boot_patch_level = context_->GetBootPatchlevel();
     if (!boot_patch_level) {
+        LOG_E("Error retrieving boot patch level: %lu", response.error);
         response.error = KM_ERROR_UNIMPLEMENTED;
         return response;
     }
 
     if (!context_->enforcement_policy()) {
+        LOG_E("Have no enforcement policy, cannot get RootOfTrust", 0);
         response.error = KM_ERROR_UNIMPLEMENTED;
         return response;
     }