Merge "Fix OfflineLicenseTest not provisioned" into android13-tests-dev

This commit is contained in:
Kyle Zhang
2023-01-12 01:15:01 +00:00
committed by Gerrit Code Review

View File

@@ -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));