Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725771fd authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "VtsHalDrmV1_0Target test failure" into oc-dev am: c6869833

am: bb68f35c

Change-Id: I05fd10acd902c70140a3acaec6096419f17159dc
parents 3098f546 bb68f35c
Loading
Loading
Loading
Loading
+11 −8
Original line number Diff line number Diff line
@@ -624,8 +624,10 @@ TEST_P(DrmHalVendorPluginTest, RestoreKeysNull) {
TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) {
    RETURN_IF_SKIPPED;
    for (auto config : contentConfigurations) {
        if (config.policy.allowOffline) {
            auto sessionId = openSession();
        hidl_vec<uint8_t> keySetId = loadKeys(sessionId, config);
            hidl_vec<uint8_t> keySetId =
                    loadKeys(sessionId, config, KeyType::OFFLINE);
            EXPECT_NE(0u, keySetId.size());
            closeSession(sessionId);
            sessionId = openSession();
@@ -634,6 +636,7 @@ TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) {
            EXPECT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status);
        }
    }
}

/**
 * Test that the plugin either doesn't support getting