commit 681bc45d2592ed447f70d1dd14e92ad584499c9d
author Zach Jang <zachjang@google.com> Tue Oct 27 02:30:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 27 02:30:56 2015 +0000
tree efba41c92e0e58ebd643dbe672147c879ac014a3
parent 6919fbe40d92af432d3b72ad36e0697654f8146c
parent 3994ffdd2c280aa5fad9f3c41255371cd545c7cf

Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""" into mnc-dev

include/media/stagefright/MediaCodecList.h

diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h
index 3aaa032..bf4db87 100644
--- a/include/media/stagefright/MediaCodecList.h
+++ b/include/media/stagefright/MediaCodecList.h
@@ -47,6 +47,10 @@
     virtual size_t countCodecs() const;
 
     virtual sp<MediaCodecInfo> getCodecInfo(size_t index) const {
+        if (index >= mCodecInfos.size()) {
+            ALOGE("b/24445127");
+            return NULL;
+        }
         return mCodecInfos.itemAt(index);
     }
 

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index b3eb5fd..45da218 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -474,6 +474,8 @@
             {
                 Mutex::Autolock _l(mDisconnectLock);
                 mDataSource.clear();
+                mDecryptHandle = NULL;
+                mDrmManagerClient = NULL;
                 mCachedSource.clear();
                 mHttpSource.clear();
             }