Merge "Add usage information tests to device files unit tests" into oc-dev

am: 3b68424d1f Change-Id: I841b1a2cbb445415996b0328ded5a36daf99b1df
2017-04-19 18:24:38 +00:00
parent 0f5f05f9cd 3b68424d1f
commit f3c6cea6dc
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