From 6404b42fb2e7140dd15526ef19fa555d23cb8b5c Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Tue, 14 Apr 2020 10:58:24 -0700
Subject: [PATCH] Correct reporting of KeyStatus usable in future

[ Merge of http://go/wvgerrit/98004 ]

This corrects mapping for KeyStatus event kKeyStatusUsableInFuture in
the legacy WVDrmPlugin. It earlier reported DrmPlugin KeyStatusType
kKeyStatusType_StatusPending and now reports kKeyStatusType_UsableInFuture.

This fixes the test failure WVDrmPluginTest.MarshalsEvents

Bug: 153509007
Bug: 116738851
Test: WV unit/integration tests
Change-Id: I4b2c74f5a0757975861ef41fa575a749ff9da391
---
 libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
index dad5e5bb..31d8ac0f 100644
--- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
@@ -66,8 +66,9 @@ DrmPlugin::KeyStatusType ConvertFromCdmKeyStatus(CdmKeyStatus keyStatus) {
     case kKeyStatusOutputNotAllowed:
       return DrmPlugin::kKeyStatusType_OutputNotAllowed;
     case kKeyStatusPending:
-    case kKeyStatusUsableInFuture:
       return DrmPlugin::kKeyStatusType_StatusPending;
+    case kKeyStatusUsableInFuture:
+      return DrmPlugin::kKeyStatusType_UsableInFuture;
     case kKeyStatusInternalError:
     default:
       return DrmPlugin::kKeyStatusType_InternalError;