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

Commit 71bb6a2a authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb

parents 7666ebd9 0cf2616f
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -493,8 +493,14 @@ rinse_repeat:

    CHECK(buffer != NULL);

    CHECK_EQ((status_t)OK,
             decryptBuffer(mSeqNumber - firstSeqNumberInPlaylist, buffer));
    err = decryptBuffer(mSeqNumber - firstSeqNumberInPlaylist, buffer);

    if (err != OK) {
        LOGE("decryptBuffer failed w/ error %d", err);

        mDataSource->queueEOS(err);
        return;
    }

    if (buffer->size() == 0 || buffer->data()[0] != 0x47) {
        // Not a transport stream???