From 266898a3523c60ebde402c87162a26d2c374f0f1 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Wed, 15 Mar 2017 13:21:37 -0700
Subject: [PATCH] Fix CTS post submit failures

MediaCodecTest.android.media.cts.MediaCodecTest.testCryptoError
was failing due to incorrect error code translation introduced
by the drm hidl hal.

Test: ANDROID_BUILD_TOP= ./android-cts/tools/cts-tradefed run cts
  --module CtsMediaTestCases --test
  android.media.cts.MediaCodecTest#testCryptoError

bug: 35137940
Change-Id: I5177367df7b57fe23a4b17c38462886786537140
---
 libwvdrmengine/src_hidl/TypeConvert.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libwvdrmengine/src_hidl/TypeConvert.cpp b/libwvdrmengine/src_hidl/TypeConvert.cpp
index 3242b920..6f1514b5 100644
--- a/libwvdrmengine/src_hidl/TypeConvert.cpp
+++ b/libwvdrmengine/src_hidl/TypeConvert.cpp
@@ -58,6 +58,9 @@ Status toStatus(status_t mediaError) {
     case android::ERROR_DRM_DEVICE_REVOKED:
         status = Status::ERROR_DRM_DEVICE_REVOKED;
         break;
+    case android::ERROR_DRM_DECRYPT:
+        status = Status::ERROR_DRM_DECRYPT;
+        break;
     default:
         ALOGW("Unable to convert legacy status: %d, defaulting to UNKNOWN",
             mediaError);