diff options
| author | 2023-08-24 20:42:24 +0000 | |
|---|---|---|
| committer | 2023-08-24 20:42:24 +0000 | |
| commit | c898f57d55983262085639e8a93c818c865908ce (patch) | |
| tree | 4f9cb2e9e1cc86c21590e126edb0ffe6e4bf3ce3 | |
| parent | 36b317757b3fe3731af80653a97dba12dcd2a84b (diff) | |
| parent | 20e9f69cfb474389c8b34ec61eb85b126f767bea (diff) | |
Merge "Use String8/16 c_str [audio]" into main am: b904e85c6a am: 8a19026a74 am: 1d18a0e9b5 am: 20e9f69cfb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724076
Change-Id: Id9dca3a14ebcd0394d63d983b486e5eaab8d34b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 4cf17b78f489..7dfd282f3660 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -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, |