commit 3e69b248ef8805b888ea1ec76f3bab773db05589
author android-build-team Robot <android-build-team-robot@google.com> Wed May 02 17:27:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 17:27:21 2018 +0000
tree 7c1066b792bae59cb9c17dcd18b7c84d304f728f
parent 1267e887bd9d38e2785b601e872a26acf0ec17f9
parent c5f013fb5d0557a9188f8d09b13eca970a31790f

Merge "Fix ndk findId" into pi-dev

media/ndk/NdkMediaDrm.cpp

diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
index fe08ab9..6d10f1c 100644
--- a/media/ndk/NdkMediaDrm.cpp
+++ b/media/ndk/NdkMediaDrm.cpp
@@ -224,7 +224,7 @@
 
 static bool findId(AMediaDrm *mObj, const AMediaDrmByteArray &id, List<idvec_t>::iterator &iter) {
     for (iter = mObj->mIds.begin(); iter != mObj->mIds.end(); ++iter) {
-        if (iter->array() == id.ptr && iter->size() == id.length) {
+        if (id.length == iter->size() && memcmp(iter->array(), id.ptr, iter->size()) == 0) {
             return true;
         }
     }