widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct WV log spam"

Browse Source
This commit is contained in:
Rahul Frias
2020-07-24 06:33:23 +00:00
committed by Android (Google) Code Review
parent e9492a8ab1 b02c9fc8ca
commit d6c8348229
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/core/src/device_files.cpp
View File

@@ -139,6 +139,10 @@ bool DeviceFiles::RetrieveCertificate(bool atsc_mode_enabled,
uint32_t* system_id) { uint32_t* system_id) {
RETURN_FALSE_IF_UNINITIALIZED(); RETURN_FALSE_IF_UNINITIALIZED();
if (!HasCertificate(atsc_mode_enabled)) {
return false;
}
video_widevine_client::sdk::File file; video_widevine_client::sdk::File file;
if (RetrieveHashedFile(GetCertificateFileName(atsc_mode_enabled), &file) != if (RetrieveHashedFile(GetCertificateFileName(atsc_mode_enabled), &file) !=
kNoError) { kNoError) {
@@ -1109,7 +1113,7 @@ DeviceFiles::ResponseType DeviceFiles::RetrieveHashedFile(
path += name; path += name;
if (!file_system_->Exists(path)) { 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; return kFileNotFound;
} }

3
libwvdrmengine/cdm/core/test/device_files_unittest.cpp
View File

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