Snap for 6777243 from 9ca0979e7f to sc-release

Change-Id: Ie6a1b14cb29a93311850c0f83e98f2f80f298565

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -34,7 +34,7 @@ using CdmProvisioningResponse = std::string;
 using CdmUsageTableHeader = std::string;
 using CdmUsageEntry = std::string;
 
-enum CdmKeyRequestType {
+enum CdmKeyRequestType : uint32_t {
   kKeyRequestTypeUnknown,
   kKeyRequestTypeInitial,
   kKeyRequestTypeRenewal,
@@ -43,13 +43,13 @@ enum CdmKeyRequestType {
   kKeyRequestTypeUpdate,
 };
 
-enum CdmOfflineLicenseState {
+enum CdmOfflineLicenseState : int32_t {
   kLicenseStateActive,
   kLicenseStateReleasing,
   kLicenseStateUnknown,
 };
 
-enum CdmResponseType {
+enum CdmResponseType : int32_t {
   NO_ERROR = 0,
   UNKNOWN_ERROR = 1,
   KEY_ADDED = 2,
@@ -421,7 +421,7 @@ enum CdmResponseType {
   //  * android/include_hidl/mapErrors-inl.h
 };
 
-enum CdmKeyStatus {
+enum CdmKeyStatus : int32_t {
   kKeyStatusKeyUnknown,
   kKeyStatusUsable,
   kKeyStatusExpired,
@@ -432,7 +432,7 @@ enum CdmKeyStatus {
 };
 using CdmKeyStatusMap = std::map<KeyId, CdmKeyStatus>;
 
-enum CdmLicenseType {
+enum CdmLicenseType : int32_t {
   kLicenseTypeOffline,
   kLicenseTypeStreaming,
   kLicenseTypeRelease,
@@ -446,48 +446,51 @@ enum CdmLicenseType {
   // on code review comments from go/wvgerrit/41860 this license type should not
   // be added. This type can be removed once it is no longer needed by
   // GenerateKeyRequest.
-  kLicenseTypeEmbeddedKeyData
+  kLicenseTypeEmbeddedKeyData,
 };
 
-enum CdmLicenseKeyType { kLicenseKeyTypeContent, kLicenseKeyTypeEntitlement };
+enum CdmLicenseKeyType : int32_t {
+  kLicenseKeyTypeContent,
+  kLicenseKeyTypeEntitlement,
+};
 
-enum SecurityLevel { kLevelDefault, kLevel3 };
+enum SecurityLevel : uint32_t { kLevelDefault, kLevel3 };
 
-enum CdmSecurityLevel {
+enum CdmSecurityLevel : int32_t {
   kSecurityLevelUninitialized,
   kSecurityLevelL1,
   kSecurityLevelL2,
   kSecurityLevelL3,
-  kSecurityLevelUnknown
+  kSecurityLevelUnknown,
 };
 
-enum CdmCertificateType {
+enum CdmCertificateType : int32_t {
   kCertificateWidevine,
   kCertificateX509,
 };
 
-enum CdmHlsMethod {
+enum CdmHlsMethod : int32_t {
   kHlsMethodNone,
   kHlsMethodAes128,
   kHlsMethodSampleAes,
 };
 
-enum CdmCipherMode {
+enum CdmCipherMode : int32_t {
   kCipherModeCtr,
   kCipherModeCbc,
 };
 
-enum CdmEncryptionAlgorithm {
+enum CdmEncryptionAlgorithm : int32_t {
   kEncryptionAlgorithmUnknown,
-  kEncryptionAlgorithmAesCbc128
+  kEncryptionAlgorithmAesCbc128,
 };
 
-enum CdmSigningAlgorithm {
+enum CdmSigningAlgorithm : int32_t {
   kSigningAlgorithmUnknown,
-  kSigningAlgorithmHmacSha256
+  kSigningAlgorithmHmacSha256,
 };
 
-enum CdmClientTokenType {
+enum CdmClientTokenType : int32_t {
   kClientTokenKeybox,
   kClientTokenDrmCert,
   kClientTokenOemCert,
@@ -500,13 +503,13 @@ enum CdmClientTokenType {
 //     persisted in non-secure storage but are loaded and unloaded from
 //     the TEE during use (OEMCrypto v13+)
 // kUnknownUsageSupport - usage support type is uninitialized or unavailable
-enum CdmUsageSupportType {
+enum CdmUsageSupportType : int32_t {
   kNonSecureUsageSupport,
   kUsageEntrySupport,
   kUnknownUsageSupport,
 };
 
-enum CdmUsageEntryStorageType {
+enum CdmUsageEntryStorageType : int32_t {
   kStorageLicense,
   kStorageUsageInfo,
   kStorageTypeUnknown,
@@ -546,7 +549,7 @@ struct CdmUsageEntryInfo {
   }
 };
 
-enum CdmKeySecurityLevel {
+enum CdmKeySecurityLevel : int32_t {
   kKeySecurityLevelUnset,
   kSoftwareSecureCrypto,
   kSoftwareSecureDecode,

libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp

@@ -233,7 +233,7 @@ TEST_F(WvCdmEngineMetricsImplTest, GenerateKeyRequest) {
 }
 
 TEST_F(WvCdmEngineMetricsImplTest, AddKey) {
-  CdmLicenseType license_type;
+  CdmLicenseType license_type = {};
   CdmKeySetId key_set_id;
 
   EXPECT_CALL(*test_cdm_metrics_engine_,

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -402,14 +402,26 @@ TEST_F(WvCdmEngineTest, LoadKey) {
   holder.SignAndLoadLicense();
 }
 
-TEST_F(WvCdmEngineTest, LicenseRenewal) {
+// This test generates a renewal and then requests the renewal using the server
+// url specified in the license. This is what most apps would do, but you should
+// skip this test when you want to set the license and renewal server on the
+// command line.
+TEST_F(WvCdmEngineTest, LicenseRenewalSpecifiedServer) {
   GenerateKeyRequest(binary_key_id(), kCencMimeType);
   VerifyNewKeyResponse(config_.license_server(), config_.client_auth());
 
   GenerateRenewalRequest();
-  VerifyRenewalKeyResponse(
-      server_url_.empty() ? config_.license_server() : server_url_,
-      config_.client_auth());
+  VerifyRenewalKeyResponse(server_url_, config_.client_auth());
+}
+
+// This test generates a renewal and then requests the renewal from the same
+// server from which we requested the original license.
+TEST_F(WvCdmEngineTest, LicenseRenewalSameServer) {
+  GenerateKeyRequest(binary_key_id(), kCencMimeType);
+  VerifyNewKeyResponse(config_.license_server(), config_.client_auth());
+
+  GenerateRenewalRequest();
+  VerifyRenewalKeyResponse(config_.license_server(), config_.client_auth());
 }
 
 TEST_F(WvCdmEngineTest, ParseDecryptHashStringTest) {

libwvdrmengine/cdm/core/test/url_request.cpp

@@ -117,7 +117,9 @@ bool UrlRequest::GetResponse(std::string* message) {
   }
 
   ConcatenateChunkedResponse(response, message);
-  LOGV("HTTP response: (%d): %s", message->size(), message->c_str());
+  LOGV("HTTP response from %s://%s:%d%s: (%zd): %s", socket_.scheme().c_str(),
+       socket_.domain_name().c_str(), socket_.port(),
+       socket_.resource_path().c_str(), message->size(), message->c_str());
   return true;
 }