summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-22 05:49:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-22 05:49:10 +0000
commita98bd9a2839b44fe87352f5f465eab4a72bc2c5d (patch)
tree4071de12518ceca4cb075474770f3602f3960425
parent404825678484a02c34868f850fdc56ada0080413 (diff)
parent216bc8eaad371747c759c22b80755cfb7a8084b8 (diff)
Merge "Use String8/16 c_str [sensors]" into main am: a51201a262 am: acbaf46c33 am: 7f9cd92495 am: 216bc8eaad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715838 Change-Id: Ibce49cb21eb635e0d82626649cecc01fcefbfa08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/jni/android_hardware_SensorManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index 9c6a534c3bbb..deb138fda867 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -150,7 +150,7 @@ static jstring getJavaInternedString(JNIEnv *env, const String8 &string) {
return gStringOffsets.emptyString;
}
- ScopedLocalRef<jstring> javaString(env, env->NewStringUTF(string.string()));
+ ScopedLocalRef<jstring> javaString(env, env->NewStringUTF(string.c_str()));
jstring internedString = (jstring)
env->CallObjectMethod(javaString.get(), gStringOffsets.intern);
return internedString;