commit c68698337cde185ad3d5bcb40654db02cba60685
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 15 07:53:26 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 15 07:53:27 2017 +0000
tree 2e85d642c58e56ba2fc663aff6e98c819c3d7db6
parent 554df3738dbd4a6a6c6249e250f78929ec0fee97
parent 779678f559badd6c9f3b1b0b616c3ffc6314fe8b

Merge "VtsHalDrmV1_0Target test failure" into oc-dev

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 14e4914..ec73a7d 100644
--- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -625,14 +625,17 @@
 TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) {
     RETURN_IF_SKIPPED;
     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);
+        }
     }
 }