drm@1.2 vts: close session before modifying offline licenses

Bug: 178904788
Test: VtsHalDrmV1_2TargetTest
Change-Id: Ia2c7830dc24abf293fa5b9ffa13e2394232cdd4b
This commit is contained in:
Robert Shih
2021-03-29 12:55:21 -07:00
parent 708a5b50b9
commit 37b39f6bd2

View File

@@ -172,6 +172,7 @@ void checkKeySetIdState(Status status, OfflineLicenseState state) {
TEST_P(DrmHalTest, OfflineLicenseTest) {
auto sessionId = openSession();
hidl_vec<uint8_t> keySetId = loadKeys(sessionId, KeyType::OFFLINE);
closeSession(sessionId);
auto res = drmPlugin->getOfflineLicenseKeySetIds(
[&](Status status, const hidl_vec<KeySetId>& keySetIds) {
@@ -201,8 +202,6 @@ TEST_P(DrmHalTest, OfflineLicenseTest) {
err = drmPlugin->removeOfflineLicense(keySetId);
EXPECT_EQ(Status::BAD_VALUE, err);
closeSession(sessionId);
}
/**
@@ -212,6 +211,8 @@ TEST_P(DrmHalTest, OfflineLicenseStateTest) {
auto sessionId = openSession();
DrmHalVTSVendorModule_V1::ContentConfiguration content = getContent(KeyType::OFFLINE);
hidl_vec<uint8_t> keySetId = loadKeys(sessionId, content, KeyType::OFFLINE);
closeSession(sessionId);
drmPlugin->getOfflineLicenseState(keySetId, checkKeySetIdState<Status::OK, OfflineLicenseState::USABLE>);
hidl_vec<uint8_t> keyRequest = getKeyRequest(keySetId, content, KeyType::RELEASE);
@@ -226,7 +227,6 @@ TEST_P(DrmHalTest, OfflineLicenseStateTest) {
provideKeyResponse(keySetId, keyResponse);
drmPlugin->getOfflineLicenseState(keySetId, checkKeySetIdState<Status::BAD_VALUE, OfflineLicenseState::UNKNOWN>);
closeSession(sessionId);
}
/**