From 30ebbefb40db9a24b85d3980ac843c58b360f328 Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Mon, 22 Mar 2021 05:44:16 -0700
Subject: [PATCH] Add CLIENT_TOKEN_NOT_SET error code

[ Merge of http://go/wvgerrit/120511 ]

Bug: 169740403
Test: WV unit/integration test
Change-Id: Iba77c0b7e7f1bee1e96b0d08f0ab8e8591292012
---
 libwvdrmengine/cdm/core/include/wv_cdm_types.h | 1 +
 libwvdrmengine/cdm/core/test/test_printers.cpp | 3 +++
 libwvdrmengine/include/WVErrors.h              | 3 ++-
 libwvdrmengine/include/mapErrors-inl.h         | 2 ++
 libwvdrmengine/include_hidl/mapErrors-inl.h    | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_types.h b/libwvdrmengine/cdm/core/include/wv_cdm_types.h
index 93c58415..7e112ccf 100644
--- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h
+++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h
@@ -419,6 +419,7 @@ enum CdmResponseType : int32_t {
   SESSION_NOT_FOUND_23 = 364,
   CERT_PROVISIONING_RESPONSE_ERROR_9 = 365,
   CERT_PROVISIONING_RESPONSE_ERROR_10 = 366,
+  CLIENT_TOKEN_NOT_SET = 367,
   // Don't forget to add new values to
   //  * core/test/test_printers.cpp.
   //  * android/include/mapErrors-inl.h
diff --git a/libwvdrmengine/cdm/core/test/test_printers.cpp b/libwvdrmengine/cdm/core/test/test_printers.cpp
index 586a828a..267444bd 100644
--- a/libwvdrmengine/cdm/core/test/test_printers.cpp
+++ b/libwvdrmengine/cdm/core/test/test_printers.cpp
@@ -93,6 +93,9 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
     case CLIENT_ID_RSA_INIT_ERROR:
       *os << "CLIENT_ID_RSA_INIT_ERROR";
       break;
+    case CLIENT_TOKEN_NOT_SET:
+      *os << "CLIENT_TOKEN_NOT_SET";
+      break;
     case COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR:
       *os << "COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR";
       break;
diff --git a/libwvdrmengine/include/WVErrors.h b/libwvdrmengine/include/WVErrors.h
index dc6b0dc7..2e81e97b 100644
--- a/libwvdrmengine/include/WVErrors.h
+++ b/libwvdrmengine/include/WVErrors.h
@@ -300,10 +300,11 @@ enum {
   kNoSrmVersion = ERROR_DRM_VENDOR_MIN + 315,
   kCertProvisioningResponseError9 = ERROR_DRM_VENDOR_MIN + 316,
   kCertProvisioningResponseError10 = ERROR_DRM_VENDOR_MIN + 317,
+  kClientTokenNotSet = ERROR_DRM_VENDOR_MIN + 318,
 
   // This should always follow the last error code.
   // The offset value should be updated each time a new error code is added.
-  kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 317,
+  kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 318,
 
   // Used by crypto test mode
   kErrorTestMode = ERROR_DRM_VENDOR_MAX,
diff --git a/libwvdrmengine/include/mapErrors-inl.h b/libwvdrmengine/include/mapErrors-inl.h
index 5a871d92..ab35381c 100644
--- a/libwvdrmengine/include/mapErrors-inl.h
+++ b/libwvdrmengine/include/mapErrors-inl.h
@@ -119,6 +119,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
       return kClientIdRsaEncryptError;
     case wvcdm::CLIENT_ID_RSA_INIT_ERROR:
       return kClientIdRsaInitError;
+    case wvcdm::CLIENT_TOKEN_NOT_SET:
+      return kClientTokenNotSet;
     case wvcdm::COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR:
       return kCopyOldUsageEntryUnknownError;
     case wvcdm::CORE_MESSAGE_NOT_FOUND:
diff --git a/libwvdrmengine/include_hidl/mapErrors-inl.h b/libwvdrmengine/include_hidl/mapErrors-inl.h
index 70b17a66..60e83548 100644
--- a/libwvdrmengine/include_hidl/mapErrors-inl.h
+++ b/libwvdrmengine/include_hidl/mapErrors-inl.h
@@ -360,6 +360,7 @@ static Status mapCdmResponseType_1_0(wvcdm::CdmResponseType res) {
     case wvcdm::NO_SRM_VERSION:
     case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_9:
     case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_10:
+    case wvcdm::CLIENT_TOKEN_NOT_SET:
       ALOGW("Returns UNKNOWN error for legacy status: %d", res);
       return Status::ERROR_DRM_UNKNOWN;
 
@@ -521,6 +522,7 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
     case wvcdm::USAGE_INVALID_PARAMETERS_1:
     case wvcdm::USAGE_INVALID_PARAMETERS_2:
     case wvcdm::USAGE_STORE_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE:
+    case wvcdm::CLIENT_TOKEN_NOT_SET:
       err = ::drm::V1_4::Status::GENERAL_PLUGIN_ERROR;
       break;
     case wvcdm::CLIENT_ID_GENERATE_RANDOM_ERROR: