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

am: f3c6cea6dc Change-Id: I20cad95318f972c4848c2b93a6fcdd62ac62aedc
2017-04-19 18:27:20 +00:00
parent f7c44ee4f7 f3c6cea6dc
commit 64de078bc0
2 changed files with 939 additions and 443 deletions
--- a/libwvdrmengine/cdm/core/src/device_files.cpp
+++ b/libwvdrmengine/cdm/core/src/device_files.cpp
@@ -737,6 +737,11 @@ bool DeviceFiles::ListUsageInfoFiles(
    return false;
  }

+  if (usage_info_file_names == NULL) {
+    LOGW("DeviceFiles::ListUsageInfoFiles: usage_info_file_names not provided");
+    return false;
+  }
+
  // Get list of filenames
  std::vector<std::string> filenames;
  if (!ListFiles(&filenames)) {
--- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp