Merges to android Pi release (part 4)

These are a set of CLs merged from the wv cdm repo to the android repo.

* Correct RELEASE_ALL_USAGE_INFO_ERRORs

  Author: Rahul Frias <rfrias@google.com>

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

  RELEASE_ALL_USAGE_INFO_ERROR_4 and 5 were introduced and made use of in
  http://go/wvgerrit/24022 (branch: oc-dev). The error code definitions
  were merged over in http://go/wvgerrit/24602.

  When http://go/wvgerrit/24622 from cdm_partners_3.2 was merged to master
  (http://go/wvgerrit/27723) there was conflict in error codes. The error
  codes were adjusted to RELEASE_ALL_USAGE_INFO_ERROR_3 and 4
  and were made use of.

  To avoid renaming the errors between oc-dev and master, new errors
  RELEASE_ALL_USAGE_INFO_ERROR_6 and 7 have been added to handle the
  scenarios noted in the merge from cdm_partner_3.2. The other
  errors have been reverted back to RELEASE_ALL_USAGE_INFO_ERROR_4 and 5.
  They will be used when http://go/wvgerrit/24602 is merged.

* Address compilation issues

  Author: Rahul Frias <rfrias@google.com>

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

  These changes enable compilation of most of the cdm code on android
  expect for OEMCrypto unit tests (b/62739406) on wv master.

* Add property for binary/base64 provisioning msgs.

  Author: Gene Morgan <gmorgan@google.com>

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

  Property is "provisioning_messages_are_binary". Its default setting is
  false in the CE CDM, but it can be overridden by integrators.

  Added section to integration guide that discusses Provisioning Server
  message formats and the new property.

  Link: https://docs.google.com/document/d/1cBVbhgrajLpDe2W3_vzLzUqzpdDt73chvm4_sZlZlS8/edit#heading=h.hgxw53ddw7jo

BUG: 71650075
Test: Not currently passing. Will be addressed in a subsequent
      commit in the chain.

Change-Id: I9168193819974d1ff65d9a94dbd762e45ecc43ca

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -24,6 +24,7 @@ namespace wvcdm {
 class CdmClientPropertySet;
 class ServiceCertificate;
 class WvCdmEventListener;
+class UsageTableHeader;
 
 class CdmSession {
  public:
@@ -42,7 +43,7 @@ class CdmSession {
   virtual CdmResponseType RestoreOfflineSession(
       const CdmKeySetId& key_set_id, const CdmLicenseType license_type);
   virtual CdmResponseType RestoreUsageSession(
-      const CdmKeyMessage& key_request, const CdmKeyResponse& key_response);
+      const DeviceFiles::CdmUsageData& usage_data);
 
   virtual const CdmSessionId& session_id() { return session_id_; }
   virtual const CdmKeySetId& key_set_id() { return key_set_id_; }
@@ -86,6 +87,9 @@ class CdmSession {
   // ReleaseKey() - Accept response and release key.
   virtual CdmResponseType ReleaseKey(const CdmKeyResponse& key_response);
 
+  virtual CdmResponseType DeleteUsageEntry(
+      const DeviceFiles::CdmUsageData& usage_data);
+
   virtual bool IsKeyLoaded(const KeyId& key_id);
   virtual int64_t GetDurationRemaining();
 
@@ -104,7 +108,8 @@ class CdmSession {
   // Delete usage information for the list of tokens, |provider_session_tokens|.
   virtual CdmResponseType DeleteMultipleUsageInformation(
       const std::vector<std::string>& provider_session_tokens);
-  virtual CdmResponseType UpdateUsageInformation();
+  virtual CdmResponseType UpdateUsageTableInformation();
+  virtual CdmResponseType UpdateUsageEntryInformation();
 
   virtual bool is_initial_usage_update() { return is_initial_usage_update_; }
   virtual bool is_usage_update_needed() { return is_usage_update_needed_; }
@@ -118,6 +123,9 @@ class CdmSession {
   virtual bool is_temporary() { return is_temporary_; }
   virtual bool license_received() { return license_received_; }
 
+  virtual CdmUsageSupportType get_usage_support_type()
+      { return usage_support_type_; }
+
   // ReleaseCrypto() - Closes the underlying crypto session but leaves this
   // object alive. It is invalid to call any method that requires a crypto
   // session after calling this. Since calling this renders this object mostly
@@ -170,6 +178,8 @@ class CdmSession {
   CdmResponseType StoreLicense();
   bool StoreLicense(DeviceFiles::LicenseState state);
 
+  bool UpdateUsageInfo();
+
   // These setters are for testing only. Takes ownership of the pointers.
   void set_license_parser(CdmLicense* license_parser);
   void set_crypto_session(CryptoSession* crypto_session);
@@ -203,11 +213,18 @@ class CdmSession {
   SecurityLevel requested_security_level_;
   CdmAppParameterMap app_parameters_;
 
-  // decryption and usage flags
+  // decryption flags
   bool is_initial_decryption_;
   bool has_decrypted_since_last_report_;  // ... last report to policy engine.
+
+  // Usage related flags and data
   bool is_initial_usage_update_;
   bool is_usage_update_needed_;
+  CdmUsageSupportType usage_support_type_;
+  UsageTableHeader* usage_table_header_;
+  uint32_t usage_entry_number_;
+  CdmUsageEntry usage_entry_;
+  std::string usage_provider_session_token_;
 
   // information useful for offline and usage scenarios
   CdmKeyMessage key_request_;