From e1ba3ee60119a21f9efbca629fb08d65ca2b4589 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Thu, 11 Jun 2015 14:55:25 -0700 Subject: [PATCH] Fix session count properties bug: 21787354 merge of http://go/wvgerrit/14663 from the widevine repo Change-Id: Ia8618c9daba2526234c5c5c84590e74d6feebf95 --- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 10 ++++++++-- .../java/src/com/widevine/test/MediaDrmAPITest.java | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index 3ff1728a..5fa10a42 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -458,13 +458,19 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, size_t number_of_open_sessions; success = crypto_session.GetNumberOfOpenSessions(&number_of_open_sessions); if (success) { - (*key_info)[QUERY_KEY_NUMBER_OF_OPEN_SESSIONS] = number_of_open_sessions; + std::ostringstream open_sessions_stream; + open_sessions_stream << number_of_open_sessions; + (*key_info)[QUERY_KEY_NUMBER_OF_OPEN_SESSIONS] = + open_sessions_stream.str(); } size_t maximum_number_of_sessions; success = crypto_session.GetMaxNumberOfSessions(&maximum_number_of_sessions); if (success) { - (*key_info)[QUERY_KEY_MAX_NUMBER_OF_SESSIONS] = maximum_number_of_sessions; + std::ostringstream max_sessions_stream; + max_sessions_stream << maximum_number_of_sessions; + (*key_info)[QUERY_KEY_MAX_NUMBER_OF_SESSIONS] = + max_sessions_stream.str(); } return NO_ERROR; diff --git a/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java b/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java index d145c3d5..2ec57641 100644 --- a/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java +++ b/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java @@ -285,6 +285,7 @@ public class MediaDrmAPITest extends Activity { // widevine-specific properties displayText("security level: " + drm.getPropertyString("securityLevel")); displayText("system ID: " + drm.getPropertyString("systemId")); + displayText("max sessions: " + drm.getPropertyString("maxNumberOfSessions")); stopDrm(drm); }