Merge "Fix ndk findId" into pi-dev (3e69b248) · Commits · e / os / android_frameworks_av

media/ndk/NdkMediaDrm.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ media_status_t AMediaDrm_setOnEventListener(AMediaDrm *mObj, AMediaDrmEventListe

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