Update error codes

[ Merge from http://go/wvgerrit/29041 ]

This brings error codes up to date with wv master

b/62972441

Test: WV Unit/Integration tests on android

Change-Id: If676b35275bb992018b2b8bfcb76079a2fc2d1f9

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -298,6 +298,20 @@ enum CdmResponseType {
   KEY_PROHIBITED_FOR_SECURITY_LEVEL, /* 255 */
   KEY_NOT_FOUND_IN_SESSION,
   NO_USAGE_ENTRIES,
+  LIST_USAGE_ERROR_1,
+  LIST_USAGE_ERROR_2,
+  DELETE_USAGE_ERROR_1, /* 260 */
+  DELETE_USAGE_ERROR_2,
+  DELETE_USAGE_ERROR_3,
+  PRIVACY_MODE_ERROR_1,
+  PRIVACY_MODE_ERROR_2,
+  PRIVACY_MODE_ERROR_3, /* 265 */
+  EMPTY_RESPONSE_ERROR_1,
+  INVALID_PARAMETERS_ENG_24,
+  PARSE_RESPONSE_ERROR_1,
+  PARSE_RESPONSE_ERROR_2,
+  PARSE_RESPONSE_ERROR_3, /* 270 */
+  PARSE_RESPONSE_ERROR_4,
 };
 
 enum CdmKeyStatus {

libwvdrmengine/cdm/core/test/test_printers.cpp

@@ -577,7 +577,34 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
     case NO_USAGE_ENTRIES:
       *os << "NO_USAGE_ENTRIES";
       break;
-
+    case LIST_USAGE_ERROR_1: *os                 << "LIST_USAGE_ERROR_1";
+      break;
+    case LIST_USAGE_ERROR_2: *os                 << "LIST_USAGE_ERROR_2";
+      break;
+    case DELETE_USAGE_ERROR_1: *os               << "DELETE_USAGE_ERROR_1";
+      break;
+    case DELETE_USAGE_ERROR_2: *os               << "DELETE_USAGE_ERROR_2";
+      break;
+    case DELETE_USAGE_ERROR_3: *os               << "DELETE_USAGE_ERROR_3";
+      break;
+    case PRIVACY_MODE_ERROR_1: *os               << "PRIVACY_MODE_ERROR_1";
+      break;
+    case PRIVACY_MODE_ERROR_2: *os               << "PRIVACY_MODE_ERROR_2";
+      break;
+    case PRIVACY_MODE_ERROR_3: *os               << "PRIVACY_MODE_ERROR_3";
+      break;
+    case EMPTY_RESPONSE_ERROR_1: *os             << "EMPTY_RESPONSE_ERROR_1";
+      break;
+    case INVALID_PARAMETERS_ENG_24: *os << "INVALID_PARAMETERS_ENG_24";
+      break;
+    case PARSE_RESPONSE_ERROR_1: *os             << "PARSE_RESPONSE_ERROR_1";
+      break;
+    case PARSE_RESPONSE_ERROR_2: *os             << "PARSE_RESPONSE_ERROR_2";
+      break;
+    case PARSE_RESPONSE_ERROR_3: *os             << "PARSE_RESPONSE_ERROR_3";
+      break;
+    case PARSE_RESPONSE_ERROR_4: *os             << "PARSE_RESPONSE_ERROR_4";
+      break;
     default:
       *os                                        << "Unknown CdmResponseType";
       break;

libwvdrmengine/include/WVErrors.h

@@ -260,10 +260,24 @@ enum {
   kIncorrectUsageSupportType1 = ERROR_DRM_VENDOR_MIN + 247,
   kIncorrectUsageSupportType2 = ERROR_DRM_VENDOR_MIN + 248,
   kNoUsageEntries = ERROR_DRM_VENDOR_MIN + 249,
+  kListUsageError1 = ERROR_DRM_VENDOR_MIN + 250,
+  kListUsageError2 = ERROR_DRM_VENDOR_MIN + 251,
+  kDeleteUsageError1 = ERROR_DRM_VENDOR_MIN + 252,
+  kDeleteUsageError2 = ERROR_DRM_VENDOR_MIN + 253,
+  kDeleteUsageError3 = ERROR_DRM_VENDOR_MIN + 254,
+  kPrivacyModeError1 = ERROR_DRM_VENDOR_MIN + 255,
+  kPrivacyModeError2 = ERROR_DRM_VENDOR_MIN + 256,
+  kPrivacyModeError3 = ERROR_DRM_VENDOR_MIN + 257,
+  kEmptyResponseError1 = ERROR_DRM_VENDOR_MIN + 258,
+  kInvalidParametersEng24 = ERROR_DRM_VENDOR_MIN + 259,
+  kParseResponseError1 = ERROR_DRM_VENDOR_MIN + 260,
+  kParseResponseError2 = ERROR_DRM_VENDOR_MIN + 261,
+  kParseResponseError3 = ERROR_DRM_VENDOR_MIN + 262,
+  kParseResponseError4 = ERROR_DRM_VENDOR_MIN + 263,
 
   // 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 + 249,
+  kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 263,
 
   // Used by crypto test mode
   kErrorTestMode = ERROR_DRM_VENDOR_MAX,

libwvdrmengine/include/mapErrors-inl.h

@@ -467,6 +467,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
       return kListLicensesError;
     case wvcdm::INVALID_PARAMETERS_ENG_23:
       return kInvalidParametersEng23;
+    case wvcdm::INVALID_PARAMETERS_ENG_24:
+      return kInvalidParametersEng24;
     case wvcdm::USAGE_INFORMATION_SUPPORT_FAILED:
       return kUsageInformationSupportFailed;
     case wvcdm::USAGE_SUPPORT_GET_API_FAILED:
@@ -505,6 +507,32 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
       return kIncorrectUsageSupportType2;
     case wvcdm::NO_USAGE_ENTRIES:
       return kNoUsageEntries;
+    case wvcdm::LIST_USAGE_ERROR_1:
+      return kListUsageError1;
+    case wvcdm::LIST_USAGE_ERROR_2:
+      return kListUsageError2;
+    case wvcdm::DELETE_USAGE_ERROR_1:
+      return kDeleteUsageError1;
+    case wvcdm::DELETE_USAGE_ERROR_2:
+      return kDeleteUsageError2;
+    case wvcdm::DELETE_USAGE_ERROR_3:
+      return kDeleteUsageError3;
+    case wvcdm::PRIVACY_MODE_ERROR_1:
+      return kPrivacyModeError1;
+    case wvcdm::PRIVACY_MODE_ERROR_2:
+      return kPrivacyModeError2;
+    case wvcdm::PRIVACY_MODE_ERROR_3:
+      return kPrivacyModeError3;
+    case wvcdm::EMPTY_RESPONSE_ERROR_1:
+      return kEmptyResponseError1;
+    case wvcdm::PARSE_RESPONSE_ERROR_1:
+      return kParseResponseError1;
+    case wvcdm::PARSE_RESPONSE_ERROR_2:
+      return kParseResponseError2;
+    case wvcdm::PARSE_RESPONSE_ERROR_3:
+      return kParseResponseError3;
+    case wvcdm::PARSE_RESPONSE_ERROR_4:
+      return kParseResponseError4;
 
     case wvcdm::UNUSED_1:
     case wvcdm::UNUSED_2: