diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:00:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:00:56 +0000 |
| commit | 582bdf9a5961a32de27556832e23e0611c4d1cbb (patch) | |
| tree | ec33c632f8b6f6d0437342c4dfe211ae6e6f1ed3 /core/jni/android_media_AudioSystem.cpp | |
| parent | c51fdd1bbf507862c10686458d2486f57a5b9585 (diff) | |
| parent | d8c169fedf883491e46b354484909694fd52cfaf (diff) | |
| download | frameworks_base-582bdf9a5961a32de27556832e23e0611c4d1cbb.zip frameworks_base-582bdf9a5961a32de27556832e23e0611c4d1cbb.tar.gz frameworks_base-582bdf9a5961a32de27556832e23e0611c4d1cbb.tar.bz2 | |
am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
Add appropriate casts for char16_t.
Diffstat (limited to 'core/jni/android_media_AudioSystem.cpp')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 57290f0..bdeaf29 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -260,7 +260,9 @@ android_media_AudioSystem_setParameters(JNIEnv *env, jobject thiz, jstring keyVa const jchar* c_keyValuePairs = env->GetStringCritical(keyValuePairs, 0); String8 c_keyValuePairs8; if (keyValuePairs) { - c_keyValuePairs8 = String8(c_keyValuePairs, env->GetStringLength(keyValuePairs)); + c_keyValuePairs8 = String8( + reinterpret_cast<const char16_t*>(c_keyValuePairs), + env->GetStringLength(keyValuePairs)); env->ReleaseStringCritical(keyValuePairs, c_keyValuePairs); } int status = check_AudioSystem_Command(AudioSystem::setParameters(c_keyValuePairs8)); @@ -273,7 +275,8 @@ android_media_AudioSystem_getParameters(JNIEnv *env, jobject thiz, jstring keys) const jchar* c_keys = env->GetStringCritical(keys, 0); String8 c_keys8; if (keys) { - c_keys8 = String8(c_keys, env->GetStringLength(keys)); + c_keys8 = String8(reinterpret_cast<const char16_t*>(c_keys), + env->GetStringLength(keys)); env->ReleaseStringCritical(keys, c_keys); } return env->NewStringUTF(AudioSystem::getParameters(c_keys8).string()); |