Merge "Return key request type none after key rotation" into qt-dev am: 999a466275

am: 4690da2bcb

Change-Id: I45387edbb83f05dcadec53e4514cb97c68eae6c7

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -38,6 +38,8 @@ enum CdmKeyRequestType {
   kKeyRequestTypeInitial,
   kKeyRequestTypeRenewal,
   kKeyRequestTypeRelease,
+  kKeyRequestTypeNone,  // Keys are loaded and no license request is necessary
+  kKeyRequestTypeUpdate,
 };
 
 enum CdmOfflineLicenseState {

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -444,10 +444,14 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal(
   } else if (license_received_) {
     // A call to GenerateKeyRequest after the initial license has been received
     // is either a renewal/release request or a key rotation event
-    if (init_data.contains_entitled_keys())
+    if (init_data.contains_entitled_keys()) {
+      key_request->message.clear();
+      key_request->type = kKeyRequestTypeNone;
+      key_request->url.clear();
       return license_parser_->HandleEmbeddedKeyData(init_data);
-    else
+    } else {
       return GenerateRenewalRequest(key_request);
+    }
   } else {
     key_request->type = kKeyRequestTypeInitial;
 

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -1785,6 +1785,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
             &key_request);
     EXPECT_EQ(wvcdm::KEY_ADDED, status);
     EXPECT_TRUE(key_request.message.empty());
+    EXPECT_EQ(kKeyRequestTypeNone, key_request.type);
     EXPECT_TRUE(key_request.url.empty());
     return wvcdm::KEY_ADDED == status && key_request.message.empty()
         && key_request.url.empty();