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

Commit 82098b92 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8658309 from 000c0144 to tm-release 

Change-Id: If98b6ffab5aee689ddf3ee830074d643bf4ee35c
parents 8c63ddd2 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;

}