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

Commit 8e9eed33 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused variables." into oc-mr1-dev

parents 85e93f0a 8da14867

drm/1.0/vts/functional/drm_hal_clearkey_test.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1064,8 +1064,6 @@ void DrmHalClearkeyDecryptTest::aes_cbc_decrypt(uint8_t* dest, uint8_t* src, 
    AES_set_encrypt_key(&key[0], 128, &decryptionKey);



    size_t offset = 0;

    size_t num = 0;

    size_t ecount_buf = 0;

    for (size_t i = 0; i < subSamples.size(); i++) {

        memcpy(dest + offset, src + offset, subSamples[i].numBytesOfClearData);

        offset += subSamples[i].numBytesOfClearData;
@@ -1106,7 +1104,6 @@ TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) { 
    Status status = cryptoPlugin->setMediaDrmSession(sessionId);

    EXPECT_EQ(Status::OK, status);



    const bool kNotSecure = false;

    uint32_t byteCount = decrypt(Mode::UNENCRYPTED, &iv[0], subSamples,

            noPattern, Status::OK);

    EXPECT_EQ(kByteCount, byteCount);
@@ -1133,7 +1130,6 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTest) { 
    Status status = cryptoPlugin->setMediaDrmSession(sessionId);

    EXPECT_EQ(Status::OK, status);



    const bool kNotSecure = false;

    uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples,

            noPattern, Status::OK);

    EXPECT_EQ(kClearBytes + kEncryptedBytes, byteCount);
@@ -1154,7 +1150,6 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTestNoKeys) { 
    Status status = cryptoPlugin->setMediaDrmSession(sessionId);

    EXPECT_EQ(Status::OK, status);



    const bool kNotSecure = false;

    uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples,

            noPattern, Status::ERROR_DRM_NO_LICENSE);

    EXPECT_EQ(0u, byteCount);

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1406,8 +1406,6 @@ void DrmHalVendorDecryptTest::aes_cbc_decrypt(uint8_t* dest, uint8_t* src, 
    AES_set_encrypt_key(&key[0], 128, &decryptionKey);



    size_t offset = 0;

    size_t num = 0;

    size_t ecount_buf = 0;

    for (size_t i = 0; i < subSamples.size(); i++) {

        const SubSample& subSample = subSamples[i];