commit ceb2370f8167e80fb9c4c6c479d7e8b817c5812b
author Edwin Wong <edwinwong@google.com> Tue Nov 08 00:14:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 00:14:47 2016 +0000
tree 47a7ce3b88ec40dab2263f460dd860dde291a624
parent 984ef5ce8ef224cc6982e156bcafefc786e4fcc6
parent 8cc90e4d0c9931a2191654d6616779af07f74181

Merge "Fix findId spinning if session id is not found. *** DO NOT MERGE ***" into nyc-mr2-dev

media/ndk/NdkMediaDrm.cpp

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