From b1fd332cc5970d0dcc00cba33baeeab87b44a91b Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Mon, 12 Dec 2022 18:14:00 +0000 Subject: [PATCH] Fix mapCdmResponseType template. Merged from http://go/wvgerrit/163457 mapCdmResponseType is called either with an enum or a CdmResponseType struct. Test: build android.hardware.drm-service.widevine Test: Netflix and Play Movies & TV Test: build_and_run_all_unit_tests.sh Test: atest MediaDrmParameterizedTests Test: atest DrmSessionManagerTest Bug: 253271674 Bug: 262210157 Change-Id: Ieb9fccf33f54a98c67ddf7655d2a5ada7a946114 --- libwvdrmengine/include/mapErrors-inl.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libwvdrmengine/include/mapErrors-inl.h b/libwvdrmengine/include/mapErrors-inl.h index 42964482..5cd80c42 100644 --- a/libwvdrmengine/include/mapErrors-inl.h +++ b/libwvdrmengine/include/mapErrors-inl.h @@ -16,11 +16,6 @@ namespace wvdrm { using ::aidl::android::hardware::drm::Status; -template -static S mapCdmResponseType(wvcdm::CdmResponseType res) { - return mapCdmResponseType(static_cast(res)); -} - template static S mapCdmResponseType(wvcdm::CdmResponseEnum res) { Status err = Status::ERROR_DRM_UNKNOWN; @@ -439,6 +434,11 @@ static S mapCdmResponseType(wvcdm::CdmResponseEnum res) { return static_cast(err); } +template +static S mapCdmResponseType(wvcdm::CdmResponseType res) { + return mapCdmResponseType(static_cast(res)); +} + static inline bool isCdmResponseTypeSuccess(wvcdm::CdmResponseType res) { return mapCdmResponseType(res) == Status::OK; }