commit 3bb9e7444850eb999fdc924496b237693856ef24
author Ronghua Wu <ronghuawu@google.com> Wed Jul 08 10:04:48 2015 -0700
committer Ronghua Wu <ronghuawu@google.com> Wed Jul 08 10:04:48 2015 -0700
tree 165222754d435698205d4a55592cab74fcdb28ce
parent dfad5454e0caf46f8732f1415d3b9a76f2a1242e

libstagefright: get secure and non-secure codec policy from mediacodec list global settings

Bug: 21171205
Change-Id: Ie30f5234c2a7c0103138b85cc7360f9e3f470088

media/libstagefright/MediaCodecList.cpp

diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index 7ea5cbd..5edc04c 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -216,6 +216,12 @@
                         String8(kPolicySupportsMultipleSecureCodecs),
                         String8(value.c_str())));
     }
+    if (mGlobalSettings->findString(kPolicySupportsSecureWithNonSecureCodec, &value)) {
+        policies.push_back(
+                MediaResourcePolicy(
+                        String8(kPolicySupportsSecureWithNonSecureCodec),
+                        String8(value.c_str())));
+    }
     if (policies.size() > 0) {
         sp<IServiceManager> sm = defaultServiceManager();
         sp<IBinder> binder = sm->getService(String16("media.resource_manager"));