Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 02:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add multiple provision attempts in vts openSession test" into tm-dev

Browse Source
This commit is contained in:
Robert Shih
2022-05-28 07:07:32 +00:00
committed by Android (Google) Code Review
parent 694e50be3b f782f6431c
commit 000c0144ce
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drm/aidl/vts/drm_hal_common.cpp
View File

@@ -73,6 +73,7 @@ std::string HalBaseName(const std::string& fullname) {
} }
const char* kDrmIface = "android.hardware.drm.IDrmFactory"; 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) { std::string HalFullName(const std::string& iface, const std::string& basename) {
return iface + '/' + basename; return iface + '/' + basename;
@@ -328,9 +329,19 @@ SessionId DrmHalTest::openSession(SecurityLevel level, Status* err) {
*/ */
SessionId DrmHalTest::openSession() { SessionId DrmHalTest::openSession() {
SessionId sessionId; SessionId sessionId;
auto ret = drmPlugin->openSession(SecurityLevel::DEFAULT, &sessionId);
EXPECT_OK(ret); int attmpt = 0;
EXPECT_NE(0u, sessionId.size()); 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; return sessionId;
} }