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

Commit c0156bec authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix OfflineLicenseTest not provisioned" into android13-tests-dev am:... 

Merge "Fix OfflineLicenseTest not provisioned" into android13-tests-dev am: 6da64e6b am: 0c20acbb am: b07f372d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2379310



Change-Id: I5984960be548f65dbfe292611ed9fa671b5f43fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccafe770 b07f372d

drm/aidl/vts/drm_hal_test.cpp

+12 −0
Original line number Original line Diff line number Diff line
@@ -198,6 +198,18 @@ TEST_P(DrmHalTest, OfflineLicenseTest) { 
        EXPECT_NE(keySetId, keySetId2.keySetId);

        EXPECT_NE(keySetId, keySetId2.keySetId);

    }

    }





    for (auto level : {kHwSecureAll, kSwSecureCrypto}) {

        Status err = Status::OK;

        auto sid = openSession(level, &err);

        if (err == Status::OK) {

            closeSession(sid);

        } else if (err == Status::ERROR_DRM_CANNOT_HANDLE) {

            continue;

        } else {

            EXPECT_EQ(Status::ERROR_DRM_NOT_PROVISIONED, err);

            provision();

        }

    }

    ret = drmPlugin->removeOfflineLicense({keySetId});

    ret = drmPlugin->removeOfflineLicense({keySetId});

    EXPECT_TXN(ret);

    EXPECT_TXN(ret);

    EXPECT_EQ(Status::BAD_VALUE, DrmErr(ret));

    EXPECT_EQ(Status::BAD_VALUE, DrmErr(ret));