From e006233589815dfd94d3669a1ccdd359d92cf849 Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Sat, 7 Jan 2023 01:35:49 +0000 Subject: [PATCH] Fix OfflineLicenseTest not provisioned Bug: 261096489 Test: VtsAidlHalDrmTargetTest Change-Id: Iac3d96cefd5639f076a6c58517b1bb8f60562ddf --- drm/aidl/vts/drm_hal_test.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drm/aidl/vts/drm_hal_test.cpp b/drm/aidl/vts/drm_hal_test.cpp index 14b3acfc7f..847a4dc262 100644 --- a/drm/aidl/vts/drm_hal_test.cpp +++ b/drm/aidl/vts/drm_hal_test.cpp @@ -198,6 +198,18 @@ TEST_P(DrmHalTest, OfflineLicenseTest) { 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}); EXPECT_TXN(ret); EXPECT_EQ(Status::BAD_VALUE, DrmErr(ret));