From 957d4a30dd8378a45d5c4c4a1b9e00f83597296c Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Wed, 29 Mar 2017 15:12:56 -0700 Subject: [PATCH] Fix testOEMCryptoVersion Merge from go/wvgerrit/24882: The result of crypto_session.GetApiVersion is misinterpreted. Test: ANDROID_BUILD_TOP= -gts/tools/gts-tradefed run gts -m GtsMediaTestCases --test com.google.android.media.gts. MediaDrmTest#testOemCryptoVersion Test: ANDROID_BUILD_TOP= -gts/tools/gts-tradefed run gts -m GtsMediaTestCases --test com.google.android.media.gts. MediaDrmTest bug: 36728950 Change-Id: I72a05608f778fa81689013d3b231010b71329ea1 --- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index 2ded30ff..19291f9b 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -626,7 +626,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, *query_response = max_sessions_stream.str(); } else if (query_token == QUERY_KEY_OEMCRYPTO_API_VERSION) { uint32_t api_version; - if (crypto_session.GetApiVersion(&api_version)) { + if (!crypto_session.GetApiVersion(&api_version)) { LOGW("CdmEngine::QueryStatus: GetApiVersion failed"); return UNKNOWN_ERROR; }