From a1d9094721c775c5cf227b3f29e57e9553a0a4a0 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Mon, 6 May 2019 20:20:45 -0700
Subject: [PATCH] hidl plugin: add sendKeysChange_1_2

Bug: 116738851
Test: vts
Change-Id: Ifdf537ff2f4922741eba5abdd37dd2dd5e37e161
---
 libwvdrmengine/include_hidl/HidlTypes.h            |  1 +
 libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h |  5 +++++
 libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp   | 11 +++++++++++
 3 files changed, 17 insertions(+)

diff --git a/libwvdrmengine/include_hidl/HidlTypes.h b/libwvdrmengine/include_hidl/HidlTypes.h
index 51c27797..2c29749a 100644
--- a/libwvdrmengine/include_hidl/HidlTypes.h
+++ b/libwvdrmengine/include_hidl/HidlTypes.h
@@ -56,6 +56,7 @@ using drm::V1_2::KeySetId;
 using drm::V1_2::OfflineLicenseState;
 
 typedef drm::V1_1::KeyRequestType KeyRequestType_V1_1;
+typedef drm::V1_2::KeyStatus KeyStatus_V1_2;
 typedef drm::V1_2::IDrmPluginListener IDrmPluginListener_V1_2;
 typedef drm::V1_2::Status Status_V1_2;
 typedef drm::V1_2::HdcpLevel HdcpLevel_V1_2;
diff --git a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
index b3a9758e..2714cbfa 100644
--- a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
+++ b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
@@ -212,6 +212,11 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
       const hidl_vec<KeyStatus>& keyStatusList,
       bool hasNewUsableKey) override;
 
+  Return<void> sendKeysChange_1_2(
+      const hidl_vec<uint8_t>& sessionId,
+      const hidl_vec<KeyStatus_V1_2>& keyStatusList,
+      bool hasNewUsableKey) override;
+
   Return<void> sendSessionLostState(
       const hidl_vec<uint8_t>& sessionId) override;
 
diff --git a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
index 360734ef..249d14db 100644
--- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
@@ -1786,6 +1786,17 @@ Return<void> WVDrmPlugin::sendKeysChange(
   return Void();
 }
 
+Return<void> WVDrmPlugin::sendKeysChange_1_2(
+     const hidl_vec<uint8_t>& sessionId,
+     const hidl_vec<KeyStatus_V1_2>& keyStatusList, bool hasNewUsableKey) {
+  if (mListenerV1_2 != NULL) {
+      mListenerV1_2->sendKeysChange_1_2(sessionId, keyStatusList, hasNewUsableKey);
+  } else {
+    ALOGE("Null event listener, event not sent");
+  }
+  return Void();
+}
+
 Return<void> WVDrmPlugin::sendSessionLostState(
     const hidl_vec<uint8_t>& sessionId) {
   if (mListenerV1_2 != NULL) {