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

Merge "Add usage information tests to device files unit tests" into oc-dev am: 3b68424d1f

Browse Source 
am: f3c6cea6dc

Change-Id: I20cad95318f972c4848c2b93a6fcdd62ac62aedc
This commit is contained in:
Rahul Frias
2017-04-19 18:27:20 +00:00
committed by android-build-merger
parent f7c44ee4f7 f3c6cea6dc
commit 64de078bc0
2 changed files with 939 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -737,6 +737,11 @@ bool DeviceFiles::ListUsageInfoFiles(
return false; return false;
} }
if (usage_info_file_names == NULL) {
LOGW("DeviceFiles::ListUsageInfoFiles: usage_info_file_names not provided");
return false;
}
// Get list of filenames // Get list of filenames
std::vector<std::string> filenames; std::vector<std::string> filenames;
if (!ListFiles(&filenames)) { if (!ListFiles(&filenames)) {

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

File diff suppressed because it is too large Load Diff