Merge "Add additional VTS drm tests for widevine" into oc-dev

2017-04-06 18:20:58 +00:00
parent cfcdceaa4f cfe80bc234
commit 70d15e286f
4 changed files with 17 additions and 8 deletions
--- a/libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp
+++ b/libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp
@@ -82,6 +82,9 @@ void WVCryptoPlugin::notifyResolution(uint32_t width, uint32_t height) {
 status_t WVCryptoPlugin::setMediaDrmSession(const Vector<uint8_t>& sessionId) {
  CdmSessionId cdmSessionId(reinterpret_cast<const char *>(sessionId.array()),
                            sessionId.size());
+  if (sessionId.size() == 0) {
+      return android::BAD_VALUE;
+  }
  if (!mCDM->IsOpenSession(cdmSessionId)) {
    return android::ERROR_DRM_SESSION_NOT_OPENED;
  } else {