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

Commit bb68f35c 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

Change-Id: I27822a0c35274a1893ee0ebad50046a0f14a981e
parents af3191bf c6869833

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

+11 −8
Original line number Diff line number Diff line
@@ -625,8 +625,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();
@@ -635,6 +637,7 @@ TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) { 
            EXPECT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status);

        }

    }

}



/**

 * Test that the plugin either doesn't support getting