commit 215e06a93989b53efb9bfdc6e4a5fb8fe9cbbede
author Robert Shih <robertshih@google.com> Sat May 28 07:28:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 28 07:28:59 2022 +0000
tree 579c50b35f233b741309c33f8ffbd7fb5013d4fc
parent 8cd0e2a5cf7cff97edce54c3e93e7747e7afb6c4
parent 000c0144ced9640f97d3f79024d387ef2bed81c7

Merge "Add multiple provision attempts in vts openSession test" into tm-dev am: 000c0144ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18565737

Change-Id: I4ba517b9de985bbc9a1dd0213acc11eb31297cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
 }