commit 779678f559badd6c9f3b1b0b616c3ffc6314fe8b
author Jeff Tinker <jtinker@google.com> Fri Apr 14 16:05:11 2017 -0700
committer Jeff Tinker <jtinker@google.com> Fri Apr 14 16:13:19 2017 -0700
tree ee55b4d008bb6a6b62edffe1690765c3ebbafc5e
parent 04b086dd08cd492e1860d23845334786b16d9154

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

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 90608b9..0ea35c4 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, RestoreKeysClosedSession) {
     for (auto config : contentConfigurations) {
-        auto sessionId = openSession();
-        hidl_vec<uint8_t> 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<uint8_t> 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);
+        }
     }
 }