commit 291deb99dc7c8d210f236648c4a57bea622a976b
author Robert Shih <robertshih@google.com> Mon Sep 21 15:22:40 2020 -0700
committer Robert Shih <robertshih@google.com> Tue Sep 22 22:50:04 2020 +0000
tree b729d33ef2c11649f1a85f10094332988a1029d3
parent 3195a1323fc0a91a7e645cbde87a1e643fa11a38

libmediadrm: support USABLE_IN_FUTURE in getMetrics

Bug: 169073078
Test: MediaDrmMetricsTest
Test: MediaDrmTest#testValidateMetrics
Test: WidevineDashPolicyTests#testL1ValidateKeyUsableInFuture
Change-Id: I1fb5067bab63bd736b42f2034d5c2c0f1c5e3e79

drm/libmediadrm/DrmMetricsConsumer.cpp

diff --git a/drm/libmediadrm/DrmMetricsConsumer.cpp b/drm/libmediadrm/DrmMetricsConsumer.cpp
index b47b4ff..5f0b26e 100644
--- a/drm/libmediadrm/DrmMetricsConsumer.cpp
+++ b/drm/libmediadrm/DrmMetricsConsumer.cpp
@@ -37,8 +37,8 @@
 template <> std::string GetAttributeName<KeyStatusType>(KeyStatusType type) {
     static const char *type_names[] = {"USABLE", "EXPIRED",
                                        "OUTPUT_NOT_ALLOWED", "STATUS_PENDING",
-                                       "INTERNAL_ERROR"};
-    if (((size_t)type) > arraysize(type_names)) {
+                                       "INTERNAL_ERROR", "USABLE_IN_FUTURE"};
+    if (((size_t)type) >= arraysize(type_names)) {
         return "UNKNOWN_TYPE";
     }
     return type_names[(size_t)type];
@@ -48,7 +48,7 @@
     static const char *type_names[] = {"PROVISION_REQUIRED", "KEY_NEEDED",
                                        "KEY_EXPIRED", "VENDOR_DEFINED",
                                        "SESSION_RECLAIMED"};
-    if (((size_t)type) > arraysize(type_names)) {
+    if (((size_t)type) >= arraysize(type_names)) {
         return "UNKNOWN_TYPE";
     }
     return type_names[(size_t)type];