From 779678f559badd6c9f3b1b0b616c3ffc6314fe8b Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Fri, 14 Apr 2017 16:05:11 -0700 Subject: [PATCH] VtsHalDrmV1_0Target test failure The DrmHalVendorPluginTest.RestoreKeysClosedSession test wasn't taking into account the policy of the asset, so both streaming and offline assets were included in the test which is incorrect. Test: drm vts test passes bug:37358379 Change-Id: I41116e77a1ae306bb1a484e3714360c8553590f0 --- .../vts/functional/drm_hal_vendor_test.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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 90608b921c..0ea35c44ef 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -591,14 +591,17 @@ TEST_P(DrmHalVendorPluginTest, RestoreKeysNull) { */ TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) { for (auto config : contentConfigurations) { - auto sessionId = openSession(); - hidl_vec keySetId = loadKeys(sessionId, config); - EXPECT_NE(0u, keySetId.size()); - closeSession(sessionId); - sessionId = openSession(); - closeSession(sessionId); - Status status = drmPlugin->restoreKeys(sessionId, keySetId); - EXPECT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status); + if (config.policy.allowOffline) { + auto sessionId = openSession(); + hidl_vec keySetId = + loadKeys(sessionId, config, KeyType::OFFLINE); + EXPECT_NE(0u, keySetId.size()); + closeSession(sessionId); + sessionId = openSession(); + closeSession(sessionId); + Status status = drmPlugin->restoreKeys(sessionId, keySetId); + EXPECT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status); + } } }