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

Commit 9d846926 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "NdkMediaDrm: send provision event with 0 data" am: facb434d am:...

Merge "NdkMediaDrm: send provision event with 0 data" am: facb434d am: f36125fe am: c0bf3358 am: ac9341fa

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2157776



Change-Id: I876d683dac434fee2a441d9d25139696f5920e13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60f096b7 ac9341fa
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void DrmListener::sendEvent(
    AMediaDrmSessionId asid = {sessionId.data(), sessionId.size()};
    int32_t dataSize = data.size();
    const uint8_t *dataPtr = data.data();
    if (dataSize > 0) {
    if (dataSize >= 0) {
        (*mEventListener)(mObj, &asid, ndkEventType, 0, dataPtr, dataSize);
    } else {
        ALOGE("invalid event data size=%d", dataSize);