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

Commit 814fd71f authored by Rahul Frias's avatar Rahul Frias
Browse files

Return error to NDK on failure 

Corrections to AMediaDrm_openSession and AMediaDrm_provideKeyResponse
to return an appropriate error from the plugin.

Bug: 177481075
Test: NativeMediaDrmClearkeyTest
Change-Id: Ieedbf5b50902fb410286a567452f0020ff4f1a53
parent ec3b5095

media/ndk/NdkMediaDrm.cpp

+9 −5
Original line number Diff line number Diff line
@@ -380,12 +380,15 @@ media_status_t AMediaDrm_openSession(AMediaDrm *mObj, AMediaDrmSessionId *sessio 
    }

    Vector<uint8_t> session;

    status_t status = mObj->mDrm->openSession(DrmPlugin::kSecurityLevelMax, session);

    if (status == OK) {

    if (status != OK) {

        sessionId->ptr = NULL;

        sessionId->length = 0;

        return translateStatus(status);

    }

    mObj->mIds.push_front(session);

    List<idvec_t>::iterator iter = mObj->mIds.begin();

    sessionId->ptr = iter->array();

    sessionId->length = iter->size();

    }

    return AMEDIA_OK;

}
@@ -489,6 +492,7 @@ media_status_t AMediaDrm_provideKeyResponse(AMediaDrm *mObj, const AMediaDrmScop 
    } else {

        keySetId->ptr = NULL;

        keySetId->length = 0;

        return translateStatus(status);

    }

    return AMEDIA_OK;

}