commit bd4acc2f9b64b2694d3dd3d77a5758c91b565f3c
author Lajos Molnar <lajos@google.com> Tue Mar 15 19:22:27 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 15 19:22:28 2016 +0000
tree 106ad5ac90883cf03c6cb6139141af20e550a17f
parent b5a4d9605f6ee009984165f1c894b3949dc8417a
parent c04399feab8e51531975a4b404327511b094bbf6

Merge "media: don't expose private keys in MediaFormat" into nyc-dev

media/jni/android_media_Utils.cpp

diff --git a/media/jni/android_media_Utils.cpp b/media/jni/android_media_Utils.cpp
index 12833f4..62685c9 100644
--- a/media/jni/android_media_Utils.cpp
+++ b/media/jni/android_media_Utils.cpp
@@ -307,6 +307,11 @@
         AMessage::Type valueType;
         const char *key = msg->getEntryNameAt(i, &valueType);
 
+        if (!strncmp(key, "android._", 9)) {
+            // don't expose private keys (starting with android._)
+            continue;
+        }
+
         jobject valueObj = NULL;
 
         switch (valueType) {
@@ -460,6 +465,11 @@
         env->ReleaseStringUTFChars((jstring)keyObj, tmp);
         tmp = NULL;
 
+        if (key.startsWith("android._")) {
+            // don't propagate private keys (starting with android._)
+            continue;
+        }
+
         jobject valueObj = env->GetObjectArrayElement(values, i);
 
         if (env->IsInstanceOf(valueObj, stringClass.get())) {