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

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

Merge "Fix VtsHalDrmV1_0Target test failure" into oc-dev 

am: 1fd47b29

Change-Id: I947939edad4fc89c4e58119581205874e17cfdbd
parents ab3e767b 1fd47b29

drm/1.0/vts/functional/drm_hal_clearkey_test.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ TEST_F(DrmHalClearkeyFactoryTest, InvalidPluginNotSupported) { 
 */

 */

TEST_F(DrmHalClearkeyFactoryTest, EmptyPluginUUIDNotSupported) {

TEST_F(DrmHalClearkeyFactoryTest, EmptyPluginUUIDNotSupported) {

    hidl_array<uint8_t, 16> emptyUUID;

    hidl_array<uint8_t, 16> emptyUUID;

    memset(emptyUUID.data(), 0, 16);

    EXPECT_FALSE(drmFactory->isCryptoSchemeSupported(emptyUUID));

    EXPECT_FALSE(drmFactory->isCryptoSchemeSupported(emptyUUID));

    EXPECT_FALSE(cryptoFactory->isCryptoSchemeSupported(emptyUUID));

    EXPECT_FALSE(cryptoFactory->isCryptoSchemeSupported(emptyUUID));

}

}

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,7 @@ TEST_P(DrmHalVendorFactoryTest, InvalidPluginNotSupported) { 
 */

 */

TEST_P(DrmHalVendorFactoryTest, EmptyPluginUUIDNotSupported) {

TEST_P(DrmHalVendorFactoryTest, EmptyPluginUUIDNotSupported) {

    hidl_array<uint8_t, 16> emptyUUID;

    hidl_array<uint8_t, 16> emptyUUID;

    memset(emptyUUID.data(), 0, 16);

    EXPECT_FALSE(drmFactory->isCryptoSchemeSupported(emptyUUID));

    EXPECT_FALSE(drmFactory->isCryptoSchemeSupported(emptyUUID));

    EXPECT_FALSE(cryptoFactory->isCryptoSchemeSupported(emptyUUID));

    EXPECT_FALSE(cryptoFactory->isCryptoSchemeSupported(emptyUUID));

}

}