Merge "Fix API support for Widevine vendor metrics" into pi-dev

2018-05-10 17:00:24 +00:00
parent aa183af75b e7edb5d2e2
commit a6ad2933fb
7 changed files with 1235 additions and 4 deletions
--- a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
+++ b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
@@ -125,10 +125,7 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
  Return<Status> releaseSecureStop(
      const hidl_vec<uint8_t>& secureStopId) override;

-  Return<void> getMetrics(getMetrics_cb _hidl_cb) {
-      _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, hidl_vec<DrmMetricGroup>());
-      return Void();
-  }
+  Return<void> getMetrics(getMetrics_cb _hidl_cb);

  Return<void> getSecureStopIds(getSecureStopIds_cb _hidl_cb) override;