commit 52ea2d077253ed5e2456371ec7cb5ecd16dc90fd
author Jeff Tinker <jtinker@google.com> Thu Apr 13 18:08:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 13 18:08:32 2017 +0000
tree ed13d92407b21aef3f73d5c972421a5d06d134a2
parent 662493ced3bd9f691d3e3f31d3ab5136a6fbd540
parent ca7205fa6102f4100302ded4b27bed1773f48ab7

Merge "DRM vts test bug fixes" into oc-dev
am: ca7205fa61

Change-Id: I873889b274818b27064f32467828ac18c14c9c92

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
index 93e6d46..fec43cf 100644
--- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -953,6 +953,7 @@
     EXPECT_TRUE(result.args);
     EXPECT_EQ(sessionId, result.args->sessionId);
     EXPECT_EQ(keyStatusList, result.args->keyStatusList);
+    closeSession(sessionId);
 }
 
 /**
@@ -1429,7 +1430,7 @@
 
             uint32_t byteCount = decrypt(Mode::AES_CTR, key.isSecure,
                     toHidlArray(key.keyId), &iv[0], subSamples, noPattern,
-                    key.clearContentKey, Status::ERROR_DRM_DECRYPT);
+                    key.clearContentKey, Status::ERROR_DRM_NO_LICENSE);
             EXPECT_EQ(0u, byteCount);
 
             closeSession(sessionId);