commit 3b64fd364e3432ac96eceeb8b03aebffaeffef14
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 25 23:54:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 25 23:54:47 2020 +0000
tree fc4ca5669c15b313bb0deec1b8fa4dbb0f3ad742
parent a8a3e652ef812cadda77120717f623aaa90cc41a
parent 291deb99dc7c8d210f236648c4a57bea622a976b

Merge "libmediadrm: support USABLE_IN_FUTURE in getMetrics" into rvc-qpr-dev

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];