commit d889aff463acf825a53ffed6796477bf4d0e33c9
author Chirag Pathak <pathakc@google.com> Tue Feb 02 07:35:38 2021 +0000
committer Chirag Pathak <pathakc@google.com> Wed Feb 10 20:48:47 2021 +0000
tree 4c8f99b35ecfe75a8041ef5718f81ad6f3059324
parent 2bb8575ea037efeb09b9a12ca09198e055e1a26b

Added the deviceLocked and earlyBootEnded implementations to KeyMintDevice in km)compat. This fixes the build errors.
Test: n/a
Bug: b/179062062

Change-Id: I7458faa917317612536d640f42372489d30d960f

keystore2/src/km_compat/km_compat.cpp

diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp
index 429a038..dedca6d 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -500,6 +500,29 @@
     return convertErrorCode(errorCode);
 }
 
+ScopedAStatus KeyMintDevice::deviceLocked(bool passwordOnly,
+                                          const std::optional<TimeStampToken>& timestampToken) {
+    V4_0_VerificationToken token;
+    if (timestampToken.has_value()) {
+        token = convertTimestampTokenToLegacy(timestampToken.value());
+    }
+    auto ret = mDevice->deviceLocked(passwordOnly, token);
+    if (!ret.isOk()) {
+        return convertErrorCode(KMV1::ErrorCode::UNKNOWN_ERROR);
+    } else {
+        return convertErrorCode(KMV1::ErrorCode::OK);
+    }
+}
+
+ScopedAStatus KeyMintDevice::earlyBootEnded() {
+    auto ret = mDevice->earlyBootEnded();
+    if (!ret.isOk()) {
+        return convertErrorCode(KMV1::ErrorCode::UNKNOWN_ERROR);
+    } else {
+        return convertErrorCode(KMV1::ErrorCode::OK);
+    }
+}
+
 ScopedAStatus KeyMintOperation::update(const std::optional<KeyParameterArray>& in_inParams,
                                        const std::optional<std::vector<uint8_t>>& in_input,
                                        const std::optional<HardwareAuthToken>& in_inAuthToken,

keystore2/src/km_compat/km_compat.h

diff --git a/keystore2/src/km_compat/km_compat.h b/keystore2/src/km_compat/km_compat.h
index 5637b58..7abccde 100644
--- a/keystore2/src/km_compat/km_compat.h
+++ b/keystore2/src/km_compat/km_compat.h
@@ -110,7 +110,9 @@
                         const std::vector<KeyParameter>& in_inParams,
                         const HardwareAuthToken& in_inAuthToken,
                         BeginResult* _aidl_return) override;
-
+    ScopedAStatus deviceLocked(bool passwordOnly,
+                               const std::optional<TimeStampToken>& timestampToken) override;
+    ScopedAStatus earlyBootEnded() override;
     // These are public to allow testing code to use them directly.
     // This class should not be used publicly anyway.