commit f782f6431c28ca75f17dae5a07e981b41d359ac7
author Kyle Zhang <kelzhan@google.com> Mon May 23 23:43:38 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Thu May 26 20:22:46 2022 +0000
tree 23296c8209d669be997903b981c7898edd67aa50
parent 412f907bd37e3c14e988d73a3fec203153e49512

Add multiple provision attempts in vts openSession test

Bug: 233085112
Test: VtsAidlHalDrmTargetTest
Change-Id: I4dd42b3c7155b6476f51a8cc4cca185bea7d565f

drm/aidl/vts/drm_hal_common.cpp

diff --git a/drm/aidl/vts/drm_hal_common.cpp b/drm/aidl/vts/drm_hal_common.cpp
index de7dc28..7de8167 100644
--- a/drm/aidl/vts/drm_hal_common.cpp
+++ b/drm/aidl/vts/drm_hal_common.cpp
@@ -73,6 +73,7 @@
 }
 
 const char* kDrmIface = "android.hardware.drm.IDrmFactory";
+const int MAX_OPEN_SESSION_ATTEMPTS = 3;
 
 std::string HalFullName(const std::string& iface, const std::string& basename) {
     return iface + '/' + basename;
@@ -328,9 +329,19 @@
  */
 SessionId DrmHalTest::openSession() {
     SessionId sessionId;
-    auto ret = drmPlugin->openSession(SecurityLevel::DEFAULT, &sessionId);
-    EXPECT_OK(ret);
-    EXPECT_NE(0u, sessionId.size());
+
+    int attmpt = 0;
+    while (attmpt++ < MAX_OPEN_SESSION_ATTEMPTS) {
+        auto ret = drmPlugin->openSession(SecurityLevel::DEFAULT, &sessionId);
+        if(DrmErr(ret) == Status::ERROR_DRM_NOT_PROVISIONED) {
+            provision();
+        } else {
+            EXPECT_OK(ret);
+            EXPECT_NE(0u, sessionId.size());
+            break;
+        }
+    }
+
     return sessionId;
 }