commit e006233589815dfd94d3669a1ccdd359d92cf849
author Kyle Zhang <kelzhan@google.com> Sat Jan 07 01:35:49 2023 +0000
committer Kyle Zhang <kelzhan@google.com> Sat Jan 07 01:35:49 2023 +0000
tree f1ab0118308e7cbaccff7d3a9ef427141017a1c6
parent 6de19308abf263b3510141c5c6e777e4f3e528b6

Fix OfflineLicenseTest not provisioned

Bug: 261096489
Test: VtsAidlHalDrmTargetTest
Change-Id: Iac3d96cefd5639f076a6c58517b1bb8f60562ddf

drm/aidl/vts/drm_hal_test.cpp

diff --git a/drm/aidl/vts/drm_hal_test.cpp b/drm/aidl/vts/drm_hal_test.cpp
index 14b3acf..847a4dc 100644
--- a/drm/aidl/vts/drm_hal_test.cpp
+++ b/drm/aidl/vts/drm_hal_test.cpp
@@ -198,6 +198,18 @@
         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));