From 2478c36b516950baadb63956fc0447c2a1dd51d7 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Thu, 4 Jun 2015 16:29:44 -0700 Subject: [PATCH] Correct mapping for too many open sessions The drm resource manager expects openSession to fail with ERROR_DRM_RESOURCE_BUSY, but in some cases the WV DRM plugin is returning a vendor-specific code kErrorTooManySessions instead. This change updates the error code mapping to match what the resource manager expects. Merge of http://go/wvgerrit/14564 from widevine repo bug: 21640598 Change-Id: I0b296ff5eeef8a6b94cfe0fd450b15f15cf03eab --- libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp index d0cffb72..67982600 100644 --- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp +++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp @@ -961,7 +961,7 @@ status_t WVDrmPlugin::mapOEMCryptoResult(OEMCryptoResult res) { case OEMCrypto_ERROR_INVALID_SESSION: return android::ERROR_DRM_SESSION_NOT_OPENED; case OEMCrypto_ERROR_TOO_MANY_SESSIONS: - return kErrorTooManySessions; + return android::ERROR_DRM_RESOURCE_BUSY; case OEMCrypto_ERROR_INVALID_RSA_KEY: return kErrorInvalidKey; case OEMCrypto_ERROR_INSUFFICIENT_RESOURCES: