Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: 7ef5203a00

Change-Id: I2c39d917e6608b39a3328a18e6af5731b04f6546
2020-04-20 19:59:22 +00:00
parent fa4d43d550 7ef5203a00
commit 3614e47762
1 changed files with 2 additions and 1 deletions
--- 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;