Changes to CryptoSession to support big usage tables

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

This allows CryptoSession to support the new functionality added to
OEMCrypto to support big usage tables. No changes in behavior yet.
Code that calls these methods will be in a subsequent CL.

b/34327459

* Minor changes to cdm/Android.mk and cdm/test/unit-test.mk to remove
  profiler changes that were missed in previous releases.

Test: All unittests other than some oemcrypto, request_license_test
passed. Those tests failed with or without this CL.

Change-Id: I9becd97c5a8ddf74d30fabd1251e796b534c010f

libwvdrmengine/include/WVErrors.h

@@ -219,9 +219,29 @@ enum {
   kLicensingClientTokenError1 = ERROR_DRM_VENDOR_MIN + 205,
   kUnknownSelectKeyError1 = ERROR_DRM_VENDOR_MIN + 206,
   kUnknownSelectKeyError2 = ERROR_DRM_VENDOR_MIN + 207,
+  kCreateUsageTableError = ERROR_DRM_VENDOR_MIN + 208,
+  kLoadUsageHeaderGenerationSkew = ERROR_DRM_VENDOR_MIN + 209,
+  kLoadUsageHeaderSignatureFailure = ERROR_DRM_VENDOR_MIN + 210,
+  kLoadUsageHeaderBadMagic = ERROR_DRM_VENDOR_MIN + 211,
+  kLoadUsageHeaderUnknownError = ERROR_DRM_VENDOR_MIN + 212,
+  kInvalidParametersEng17 = ERROR_DRM_VENDOR_MIN + 213,
+  kInvalidParametersEng18 = ERROR_DRM_VENDOR_MIN + 214,
+  kInsufficientCryptoResources3 = ERROR_DRM_VENDOR_MIN + 215,
+  kCreateUsageEntryUnknownError = ERROR_DRM_VENDOR_MIN + 216,
+  kLoadUsageEntryGenerationSkew = ERROR_DRM_VENDOR_MIN + 217,
+  kLoadUsageEntrySignatureFailure = ERROR_DRM_VENDOR_MIN + 218,
+  kLoadUsageEntryUnknownError = ERROR_DRM_VENDOR_MIN + 219,
+  kInvalidParametersEng19 = ERROR_DRM_VENDOR_MIN + 220,
+  kInvalidParametersEng20 = ERROR_DRM_VENDOR_MIN + 221,
+  kUpdateUsageEntryUnknownError = ERROR_DRM_VENDOR_MIN + 222,
+  kInvalidParametersEng21 = ERROR_DRM_VENDOR_MIN + 223,
+  kShrinkUsageTablerHeaderUnknownError = ERROR_DRM_VENDOR_MIN + 224,
+  kMoveUsageEntryUnknownError = ERROR_DRM_VENDOR_MIN + 225,
+  kCopyOldUsageEntryUnknownError = ERROR_DRM_VENDOR_MIN + 226,
+
   // 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 + 207,
+  kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 226,
 
   // Used by crypto test mode
   kErrorTestMode = ERROR_DRM_VENDOR_MAX,

libwvdrmengine/include/mapErrors-inl.h

@@ -429,6 +429,45 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
       return kUnknownSelectKeyError1;
     case wvcdm::UNKNOWN_SELECT_KEY_ERROR_2:
       return kUnknownSelectKeyError2;
+    case wvcdm::CREATE_USAGE_TABLE_ERROR:
+      return kCreateUsageTableError;
+    case wvcdm::LOAD_USAGE_HEADER_GENERATION_SKEW:
+      return kLoadUsageHeaderGenerationSkew;
+    case wvcdm::LOAD_USAGE_HEADER_SIGNATURE_FAILURE:
+      return kLoadUsageHeaderSignatureFailure;
+    case wvcdm::LOAD_USAGE_HEADER_BAD_MAGIC:
+      return kLoadUsageHeaderBadMagic;
+    case wvcdm::LOAD_USAGE_HEADER_UNKNOWN_ERROR:
+      return kLoadUsageHeaderUnknownError;
+    case wvcdm::INVALID_PARAMETERS_ENG_17:
+      return kInvalidParametersEng17;
+    case wvcdm::INVALID_PARAMETERS_ENG_18:
+      return kInvalidParametersEng18;
+    case wvcdm::INSUFFICIENT_CRYPTO_RESOURCES_3:
+      return kInsufficientCryptoResources3;
+    case wvcdm::CREATE_USAGE_ENTRY_UNKNOWN_ERROR:
+      return kCreateUsageEntryUnknownError;
+    case wvcdm::LOAD_USAGE_ENTRY_GENERATION_SKEW:
+      return kLoadUsageEntryGenerationSkew;
+    case wvcdm::LOAD_USAGE_ENTRY_SIGNATURE_FAILURE:
+      return kLoadUsageEntrySignatureFailure;
+    case wvcdm::LOAD_USAGE_ENTRY_UNKNOWN_ERROR:
+      return kLoadUsageEntryUnknownError;
+    case wvcdm::INVALID_PARAMETERS_ENG_19:
+      return kInvalidParametersEng19;
+    case wvcdm::INVALID_PARAMETERS_ENG_20:
+      return kInvalidParametersEng20;
+    case wvcdm::UPDATE_USAGE_ENTRY_UNKNOWN_ERROR:
+      return kUpdateUsageEntryUnknownError;
+    case wvcdm::INVALID_PARAMETERS_ENG_21:
+      return kInvalidParametersEng21;
+    case wvcdm::SHRINK_USAGE_TABLER_HEADER_UNKNOWN_ERROR:
+      return kShrinkUsageTablerHeaderUnknownError;
+    case wvcdm::MOVE_USAGE_ENTRY_UNKNOWN_ERROR:
+      return kMoveUsageEntryUnknownError;
+    case wvcdm::COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR:
+      return kCopyOldUsageEntryUnknownError;
+
     case wvcdm::UNUSED_1:
     case wvcdm::UNUSED_2:
     case wvcdm::UNUSED_3: