Snap for 6708411 from d6c8348229 to sc-release

Change-Id: I9534d573232b544972f4c1cd69422ec877ec11cb

libwvdrmengine/cdm/core/include/policy_timers_v16.h

@@ -84,6 +84,8 @@ class PolicyTimersV16 : public PolicyTimers {
     return GetRentalDurationRemaining(current_time);
   };
 
+  bool HasRenewalDelayExpired(int64_t current_time) override;
+
  protected:
   // Gets the clock time that the license expires based on whether we have
   // started playing.  This takes into account GetHardLicenseExpiryTime.

libwvdrmengine/cdm/core/src/device_files.cpp

@@ -139,6 +139,10 @@ bool DeviceFiles::RetrieveCertificate(bool atsc_mode_enabled,
                                       uint32_t* system_id) {
   RETURN_FALSE_IF_UNINITIALIZED();
 
+  if (!HasCertificate(atsc_mode_enabled)) {
+    return false;
+  }
+
   video_widevine_client::sdk::File file;
   if (RetrieveHashedFile(GetCertificateFileName(atsc_mode_enabled), &file) !=
       kNoError) {
@@ -1109,7 +1113,7 @@ DeviceFiles::ResponseType DeviceFiles::RetrieveHashedFile(
   path += name;
 
   if (!file_system_->Exists(path)) {
-    LOGE("File does not exist: path = %s", path.c_str());
+    LOGW("File does not exist: path = %s", path.c_str());
     return kFileNotFound;
   }
 

libwvdrmengine/cdm/core/src/policy_timers_v16.cpp

@@ -77,6 +77,12 @@ int64_t PolicyTimersV16::GetRentalDurationRemaining(int64_t current_time) {
   return rental_expiry_time - current_time;
 }
 
+bool PolicyTimersV16::HasRenewalDelayExpired(int64_t current_time) {
+  return policy_.can_renew() && (policy_.renewal_delay_seconds() > 0) &&
+         (renewal_start_time_ + policy_.renewal_delay_seconds() <=
+          current_time);
+}
+
 // For the policy time fields checked in the following methods, a value of 0
 // (UNLIMITED_DURATION) indicates that there is no limit to the duration.
 // If the fields are UNLIMITED_DURATION then these methods will return

libwvdrmengine/cdm/core/test/device_files_unittest.cpp

@@ -2160,7 +2160,8 @@ TEST_P(DeviceCertificateTest, ReadCertificate) {
   // Call to Open will return a unique_ptr, freeing this object.
   MockFile* file = new MockFile();
   EXPECT_CALL(file_system, Exists(StrEq(device_certificate_path)))
-      .WillOnce(Return(true));
+      .Times(2)
+      .WillRepeatedly(Return(true));
   EXPECT_CALL(file_system, FileSize(StrEq(device_certificate_path)))
       .WillOnce(Return(data.size()));
   EXPECT_CALL(file_system, DoOpen(StrEq(device_certificate_path), _))

libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp

@@ -3744,7 +3744,9 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess_V16) {
   EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
-TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess_WithFutureStartTime_V16) {
+// TODO(b/161992421): Rewrite after clarifying expected behavior
+TEST_F(PolicyEngineTest,
+       DISABLED_PlaybackOk_RenewSuccess_WithFutureStartTime_V16) {
   License_Policy* policy = license_.mutable_policy();
   policy->set_can_renew(true);
   const int64_t license_renewal_delay =