From 927053d6e8f2de8400942de033e42a9609d29feb Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Sun, 27 Nov 2022 18:17:50 +0000
Subject: [PATCH] Dump error_detail in dumpsys

Merged from http://go/wvgerrit/162420

Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine

Bug: 260241061
Change-Id: I28b06b201c3408d85f6ca944534ad9602bc60a85
---
 libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp | 5 +++++
 libwvdrmengine/src/wv_metrics.cpp                  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp b/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp
index 95582f19..69d72a26 100644
--- a/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp
+++ b/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp
@@ -33,6 +33,7 @@ const char kAttributeKeyStatusType[] = "key_status_type";
 const char kAttributeEventType[] = "event_type";
 const char kAttributeKeyRequestType[] = "key_request_type";
 const char kAttributeLicenseType[] = "license_type";
+const char kAttributeErrorDetail[] = "error_detail";
 
 template <typename T>
 void SetValue(const T& value, DrmMetricNamedValue* attribute);
@@ -239,6 +240,10 @@ void WvMetricsGroupBuilder::AddAttributes(
     AddAttribute(kAttributeLicenseType, attributes_proto.license_type(),
                  &attribute_vector);
   }
+  if (attributes_proto.has_error_detail()) {
+    AddAttribute(kAttributeErrorDetail, attributes_proto.error_detail(),
+                 &attribute_vector);
+  }
 
   *attributes = attribute_vector;
 }
diff --git a/libwvdrmengine/src/wv_metrics.cpp b/libwvdrmengine/src/wv_metrics.cpp
index 8cacddaa..10cb3eed 100644
--- a/libwvdrmengine/src/wv_metrics.cpp
+++ b/libwvdrmengine/src/wv_metrics.cpp
@@ -226,6 +226,11 @@ string FormatAttributes(const string& indent, const Attributes& attributes) {
     result.append("license_type: ");
     result.append(to_string(attributes.license_type()));
   }
+  if (attributes.has_error_detail()) {
+    result.assign(indent);
+    result.append("error_detail: ");
+    result.append(to_string(attributes.error_detail()));
+  }
   if (result.size()) {
     return result;
   } else {