commit c5f013fb5d0557a9188f8d09b13eca970a31790f
author Jeff Tinker <jtinker@google.com> Wed Apr 05 10:28:27 2017 -0700
committer Edwin Wong <edwinwong@google.com> Tue May 01 18:22:13 2018 +0000
tree 120f7c5b4844a09d5589c8ab342e336cc0271d1a
parent e641294b59e2a0792d894139d739228f182409b4

Fix ndk findId

|findId| should search by |id| value, rather than
original memory address

bug:35227555
Change-Id: I53257d0fa833f61258a26b7e905879eeceab6b26

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;
         }
     }