diff options
Diffstat (limited to 'core/jni/android_hardware_Camera.cpp')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 4cff56d..c4f8f20 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -516,10 +516,12 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobject weak_this, jint cameraId, jint halVersion, jstring clientPackageName) { // Convert jstring to String16 - const char16_t *rawClientName = env->GetStringChars(clientPackageName, NULL); + const char16_t *rawClientName = reinterpret_cast<const char16_t*>( + env->GetStringChars(clientPackageName, NULL)); jsize rawClientNameLen = env->GetStringLength(clientPackageName); String16 clientName(rawClientName, rawClientNameLen); - env->ReleaseStringChars(clientPackageName, rawClientName); + env->ReleaseStringChars(clientPackageName, + reinterpret_cast<const jchar*>(rawClientName)); sp<Camera> camera; if (halVersion == CAMERA_HAL_API_VERSION_NORMAL_CONNECT) { @@ -782,7 +784,8 @@ static void android_hardware_Camera_setParameters(JNIEnv *env, jobject thiz, jst const jchar* str = env->GetStringCritical(params, 0); String8 params8; if (params) { - params8 = String8(str, env->GetStringLength(params)); + params8 = String8(reinterpret_cast<const char16_t*>(str), + env->GetStringLength(params)); env->ReleaseStringCritical(params, str); } if (camera->setParameters(params8) != NO_ERROR) { |