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

Commit ceb2370f authored by Edwin Wong's avatar Edwin Wong Committed by Android (Google) Code Review
Browse files

Merge "Fix findId spinning if session id is not found. *** DO NOT MERGE ***" into nyc-mr2-dev

parents 984ef5ce 8cc90e4d

media/ndk/NdkMediaDrm.cpp

+1 −2
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ media_status_t AMediaDrm_setOnEventListener(AMediaDrm *mObj, AMediaDrmEventListe 




static bool findId(AMediaDrm *mObj, const AMediaDrmByteArray &id, List<idvec_t>::iterator &iter) {

    iter = mObj->mIds.begin();

    while (iter != mObj->mIds.end()) {

    for (iter = mObj->mIds.begin(); iter != mObj->mIds.end(); ++iter) {

        if (iter->array() == id.ptr && iter->size() == id.length) {

            return true;

        }