commit fa72c480dc24c39032cb249f67f8327e4a3a114f
author Kyle Zhang <kelzhan@google.com> Fri Feb 04 03:55:43 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Fri Feb 04 19:31:38 2022 +0000
tree 0ff1c0e416749df67ae3b0d98bcf8125b63d6fd7
parent a55209dcdf9e4a17373be384e8b02ec88d998dac

Fix toDrmMetricGroupHidl conversion

Test: atest
CtsMediaDrmTestCases: android.media.drm.cts.MediaDrmMetricsTest#testGetMetricsEmpty
Bug: 206804036
Change-Id: If3f736943ad990cfb94552626c09363362c439c6

drm/libmediadrm/DrmHalAidl.cpp

diff --git a/drm/libmediadrm/DrmHalAidl.cpp b/drm/libmediadrm/DrmHalAidl.cpp
index f785c13..9f640e0 100644
--- a/drm/libmediadrm/DrmHalAidl.cpp
+++ b/drm/libmediadrm/DrmHalAidl.cpp
@@ -246,6 +246,12 @@
     return keySetIds;
 }
 
+static hidl_vec<uint8_t> toHidlVec(const Vector<uint8_t>& vector) {
+    hidl_vec<uint8_t> vec;
+    vec.setToExternal(const_cast<uint8_t*>(vector.array()), vector.size());
+    return vec;
+}
+
 static DrmPlugin::OfflineLicenseState toOfflineLicenseState(OfflineLicenseState licenseState) {
     switch (licenseState) {
         case OfflineLicenseState::USABLE:
@@ -257,24 +263,17 @@
     }
 }
 
-template <typename T = uint8_t>
-static hidl_vec<T> toHidlVec(const Vector<T>& vector) {
-    hidl_vec<T> vec;
-    vec.setToExternal(const_cast<T*>(vector.array()), vector.size());
-    return vec;
-}
-
 Mutex DrmHalAidl::mLock;
 
 static hidl_vec<DrmMetricGroupHidl> toDrmMetricGroupHidl(std::vector<DrmMetricGroupAidl> result) {
-    Vector<DrmMetricGroupHidl> resultHidl;
+    std::vector<DrmMetricGroupHidl> resultHidl;
     for (auto r : result) {
         DrmMetricGroupHidl re;
-        Vector<DrmMetricHidl> tmpMetric;
+        std::vector<DrmMetricHidl> tmpMetric;
         for (auto m : r.metrics) {
             DrmMetricHidl me;
             me.name = m.name;
-            Vector<AttributeHidl> aTmp;
+            std::vector<AttributeHidl> aTmp;
             for (auto attr : m.attributes) {
                 AttributeHidl attrHidl;
                 attrHidl.name = attr.name;
@@ -299,9 +298,9 @@
                 aTmp.push_back(attrHidl);
             }
 
-            me.attributes = toHidlVec<AttributeHidl>(aTmp);
+            me.attributes = aTmp;
 
-            Vector<ValueHidl> vTmp;
+            std::vector<ValueHidl> vTmp;
             for (auto value : m.values) {
                 ValueHidl valueHidl;
                 valueHidl.componentName = value.name;
@@ -325,15 +324,15 @@
                 vTmp.push_back(valueHidl);
             }
 
-            me.values = toHidlVec<ValueHidl>(vTmp);
+            me.values = vTmp;
             tmpMetric.push_back(me);
         }
 
-        re.metrics = toHidlVec<DrmMetricHidl>(tmpMetric);
+        re.metrics = tmpMetric;
         resultHidl.push_back(re);
     }
 
-    return toHidlVec<DrmMetricGroupHidl>(resultHidl);
+    return resultHidl;
 }
 
 // DrmSessionClient Definition
@@ -560,6 +559,7 @@
         mMetrics.mCloseSessionCounter.Increment(response);
         return response;
     }
+
     mMetrics.mCloseSessionCounter.Increment(DEAD_OBJECT);
     return DEAD_OBJECT;
 }