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

Commit 1d18a0e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [audio]" into main am: b904e85c am: 8a19026a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724076



Change-Id: If65fe17dee466383f568f111ee5283b83fa5ccb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7e8e59f 8a19026a

core/jni/android_media_AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ android_media_AudioSystem_getParameters(JNIEnv *env, jobject thiz, jstring keys) 
                          env->GetStringLength(keys));

        env->ReleaseStringCritical(keys, c_keys);

    }

    return env->NewStringUTF(AudioSystem::getParameters(c_keys8).string());

    return env->NewStringUTF(AudioSystem::getParameters(c_keys8).c_str());

}



static void
@@ -523,7 +523,7 @@ android_media_AudioSystem_dyn_policy_callback(int event, String8 regId, int val) 
    }



    jclass clazz = env->FindClass(kClassPathName);

    const char* zechars = regId.string();

    const char *zechars = regId.c_str();

    jstring zestring = env->NewStringUTF(zechars);



    env->CallStaticVoidMethod(clazz, gAudioPolicyEventHandlerMethods.postDynPolicyEventFromNative,