Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50ef6102 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

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

am: bd4acc2f

* commit 'bd4acc2f':
  media: don't expose private keys in MediaFormat
parents 6c111d36 bd4acc2f

media/jni/android_media_Utils.cpp

+10 −0
Original line number Diff line number Diff line
@@ -307,6 +307,11 @@ status_t ConvertMessageToMap( 
        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 @@ status_t ConvertKeyValueArraysToMessage( 
        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())) {