Merge "Revert "Detect when unable to meet policy requirements"" into oc-dev

2017-04-18 20:37:22 +00:00
parent 551f4cb474 e733943729
commit 80798ae11c
11 changed files with 18 additions and 172 deletions
--- a/libwvdrmengine/include/mapErrors-inl.h
+++ b/libwvdrmengine/include/mapErrors-inl.h
@@ -368,7 +368,6 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
      return android::ERROR_DRM_CANNOT_HANDLE;
    case wvcdm::INSUFFICIENT_OUTPUT_PROTECTION:
    case wvcdm::ANALOG_OUTPUT_ERROR:
-    case wvcdm::KEY_PROHIBITED_FOR_SECURITY_LEVEL:
      return android::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION;
    case wvcdm::SESSION_NOT_FOUND_12:
      return kSessionNotFound12;