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

Correct WV log spam

Browse Source 
[ Merge of http://go/wvgerrit/102923 ]

Avoid logging an error, on first boot, when trying to retrieve a
certificate that does not yet exist.

Bug: 161201883
Test: WV unit/integration tests
Change-Id: I293f9766a7f2024107d0db45a874a9478b0c3959
This commit is contained in:
Rahul Frias
2020-07-16 19:49:27 -07:00
parent 297a289a31
commit b02c9fc8ca
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) {
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;
}

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.
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), _))