Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 568b4b82 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib4cbc5ff0312d45212bba732237267f2a48f355b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eee4267c 000c0144

drm/aidl/vts/drm_hal_common.cpp

+14 −3
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ std::string HalBaseName(const std::string& fullname) { 
}



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(SecurityLevel level, Status* err) { 
 */

SessionId DrmHalTest::openSession() {

    SessionId sessionId;



    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;

}