commit 9d84692628c29493c88e244be634e4b3d59a0960
author Robert Shih <robertshih@google.com> Thu Jul 21 03:30:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 21 03:30:14 2022 +0000
tree cd557f7178b833429efd3cf6360357dc1cd0fd86
parent 60f096b76af9bb59e9c16ca1cc691762c27d3b43
parent ac9341fa2069b220429e28827041889f8c553540

Merge "NdkMediaDrm: send provision event with 0 data" am: facb434dc1 am: f36125feba am: c0bf3358d2 am: ac9341fa20

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

Change-Id: I876d683dac434fee2a441d9d25139696f5920e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/ndk/NdkMediaDrm.cpp

diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
index 59c1103..f4674de 100644
--- a/media/ndk/NdkMediaDrm.cpp
+++ b/media/ndk/NdkMediaDrm.cpp
@@ -183,7 +183,7 @@
     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);