commit 637b7855829920114a8863b93fe52203b7471eea
author Adam Stone <blueeyes@google.com> Tue Jan 30 12:09:36 2018 -0800
committer Adam Stone <blueeyes@google.com> Fri Feb 09 16:13:49 2018 -0800
tree c33e93ec282c2d3f2c01581907dfdfc1fb63a0bf
parent ceeee83aaf61fc61e47773da0ac97659057e1c77

Fix DrmHal implementation to return all metrics

This change in DrmHal allows us to transfer a PersistableBundle containing
previously unavailable metrics.

Bug: 64001676
Test: CTS test for metrics and GPlay test
Change-Id: I1fa87c76dd980a3f91b4e2d02b37329f6c0a88ec

drm/libmediadrm/IDrm.cpp

diff --git a/drm/libmediadrm/IDrm.cpp b/drm/libmediadrm/IDrm.cpp
index 63a9562..802e16f 100644
--- a/drm/libmediadrm/IDrm.cpp
+++ b/drm/libmediadrm/IDrm.cpp
@@ -508,7 +508,7 @@
         return reply.readInt32();
     }
 
-    virtual status_t getMetrics(MediaAnalyticsItem *item) {
+    virtual status_t getMetrics(os::PersistableBundle *metrics) {
         Parcel data, reply;
         data.writeInterfaceToken(IDrm::getInterfaceDescriptor());
 
@@ -517,7 +517,7 @@
             return status;
         }
 
-        item->readFromParcel(reply);
+        metrics->readFromParcel(&reply);
         return reply.readInt32();
     }
 
@@ -1034,9 +1034,9 @@
         {
             CHECK_INTERFACE(IDrm, data, reply);
 
-            MediaAnalyticsItem item;
-            status_t result = getMetrics(&item);
-            item.writeToParcel(reply);
+            os::PersistableBundle metrics;
+            status_t result = getMetrics(&metrics);
+            metrics.writeToParcel(reply);
             reply->writeInt32(result);
             return OK;
         }