From 9dee7287e8f533c14fac292348a45ef70fe1b938 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Thu, 13 Apr 2017 00:56:34 -0700
Subject: [PATCH] DRM vts test bug fixes

A session wasn't being closed in the ListenerKeysChange
test, that was causing erratic behavior on subsequent tests.
The expected return code was incorrect in the test
AttemptDecryptWithKeysRemoved.

bug:37272108
Change-Id: I11590b85c81548622359d91ebc9af75276a7b58c
---
 drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 5945c0553b..bd7d10e162 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 @@ TEST_P(DrmHalVendorPluginTest, ListenerKeysChange) {
     EXPECT_TRUE(result.args);
     EXPECT_EQ(sessionId, result.args->sessionId);
     EXPECT_EQ(keyStatusList, result.args->keyStatusList);
+    closeSession(sessionId);
 }
 
 /**
@@ -1429,7 +1430,7 @@ TEST_P(DrmHalVendorDecryptTest, AttemptDecryptWithKeysRemoved) {
 
             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);