summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ytai Ben-tsvi <ytai@google.com> 2020-11-30 17:43:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-11-30 17:43:27 +0000
commit117b59369934a55acabcf50d559814631b39f5c3 (patch)
treeb814d66e365547b8b78ee3f161f7b072ca74f958
parentefdcf040989b595534132f1c9bfef2de99cc9970 (diff)
parentbf09501ed8c3fb3a1050781d0e7f5063a7a79afa (diff)
Merge "Adapt to change in MicrophoneInfo interface"
-rw-r--r--core/jni/android_media_MicrophoneInfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_media_MicrophoneInfo.cpp b/core/jni/android_media_MicrophoneInfo.cpp
index 5bd808b67c57..b70190fc5ec3 100644
--- a/core/jni/android_media_MicrophoneInfo.cpp
+++ b/core/jni/android_media_MicrophoneInfo.cpp
@@ -56,8 +56,8 @@ jint convertMicrophoneInfoFromNative(JNIEnv *env, jobject *jMicrophoneInfo,
jobject jFrequencyResponses = NULL;
jobject jChannelMappings = NULL;
- jDeviceId = env->NewStringUTF(String8(microphoneInfo->getDeviceId()).string());
- jAddress = env->NewStringUTF(String8(microphoneInfo->getAddress()).string());
+ jDeviceId = env->NewStringUTF(microphoneInfo->getDeviceId().c_str());
+ jAddress = env->NewStringUTF(microphoneInfo->getAddress().c_str());
if (microphoneInfo->getGeometricLocation().size() != 3 ||
microphoneInfo->getOrientation().size() != 3) {
jStatus = nativeToJavaStatus(BAD_VALUE);