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

Commit 52ea2d07 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "DRM vts test bug fixes" into oc-dev 

am: ca7205fa

Change-Id: I873889b274818b27064f32467828ac18c14c9c92
parents 662493ce ca7205fa

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -953,6 +953,7 @@ TEST_P(DrmHalVendorPluginTest, ListenerKeysChange) { 
    EXPECT_TRUE(result.args);

    EXPECT_EQ(sessionId, result.args->sessionId);

    EXPECT_EQ(keyStatusList, result.args->keyStatusList);

    closeSession(sessionId);

}



/**
@@ -1429,7 +1430,7 @@ TEST_P(DrmHalVendorDecryptTest, AttemptDecryptWithKeysRemoved) { 


            uint32_t byteCount = decrypt(Mode::AES_CTR, key.isSecure,

                    toHidlArray(key.keyId), &iv[0], subSamples, noPattern,

                    key.clearContentKey, Status::ERROR_DRM_DECRYPT);

                    key.clearContentKey, Status::ERROR_DRM_NO_LICENSE);

            EXPECT_EQ(0u, byteCount);



            closeSession(sessionId);