From f5240b69e4424a2f02cc78501fb0a936c14db653 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Fri, 14 Apr 2017 00:11:30 -0700 Subject: [PATCH] Translate CDM session not opened errors The drm hidl hal specifies that operations on sessions that are not opened return ERROR_DRM_SESSION_NOT_OPENED. This change adds that translation, previously they were mapped to unknown error. Test: drm vts test bug:34178477 Change-Id: I3777dd90eea7061f3fa5413a5732d7d58b85b49b --- libwvdrmengine/include/mapErrors-inl.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libwvdrmengine/include/mapErrors-inl.h b/libwvdrmengine/include/mapErrors-inl.h index b1b33275..a0143967 100644 --- a/libwvdrmengine/include/mapErrors-inl.h +++ b/libwvdrmengine/include/mapErrors-inl.h @@ -257,25 +257,16 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) { case wvcdm::SESSION_INIT_ERROR_2: return kSessionInitError2; case wvcdm::SESSION_NOT_FOUND_1: - return kSessionNotFound1; case wvcdm::SESSION_NOT_FOUND_2: - return kSessionNotFound2; case wvcdm::SESSION_NOT_FOUND_3: - return kSessionNotFound3; case wvcdm::SESSION_NOT_FOUND_4: - return kSessionNotFound4; case wvcdm::SESSION_NOT_FOUND_5: - return kSessionNotFound5; case wvcdm::SESSION_NOT_FOUND_6: - return kSessionNotFound6; case wvcdm::SESSION_NOT_FOUND_7: - return kSessionNotFound7; case wvcdm::SESSION_NOT_FOUND_8: - return kSessionNotFound8; case wvcdm::SESSION_NOT_FOUND_9: - return kSessionNotFound9; case wvcdm::SESSION_NOT_FOUND_10: - return kSessionNotFound10; + return android::ERROR_DRM_SESSION_NOT_OPENED; case wvcdm::SESSION_KEYS_NOT_FOUND: return kSessionKeysNotFound; case wvcdm::SIGNATURE_NOT_FOUND: