diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:19:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:19:06 +0000 |
| commit | 47249598cbada478d7e0b8dca200599c50ea6e69 (patch) | |
| tree | f08e3368758a55e7be6401e54f7a3943b15e893b /packages/services | |
| parent | 87f08193273c7e5c6615ea3afd2c947caae22ef0 (diff) | |
| parent | 582bdf9a5961a32de27556832e23e0611c4d1cbb (diff) | |
| download | frameworks_base-47249598cbada478d7e0b8dca200599c50ea6e69.zip frameworks_base-47249598cbada478d7e0b8dca200599c50ea6e69.tar.gz frameworks_base-47249598cbada478d7e0b8dca200599c50ea6e69.tar.bz2 | |
am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
Add appropriate casts for char16_t.
Diffstat (limited to 'packages/services')
| -rw-r--r-- | packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp index ca78bd4..2727338 100644 --- a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp +++ b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp @@ -48,7 +48,8 @@ bool pacSet = false; String16 jstringToString16(JNIEnv* env, jstring jstr) { const jchar* str = env->GetStringCritical(jstr, 0); - String16 str16(str, env->GetStringLength(jstr)); + String16 str16(reinterpret_cast<const char16_t*>(str), + env->GetStringLength(jstr)); env->ReleaseStringCritical(jstr, str); return str16; } @@ -57,7 +58,7 @@ jstring string16ToJstring(JNIEnv* env, String16 string) { const char16_t* str = string.string(); size_t len = string.size(); - return env->NewString(str, len); + return env->NewString(reinterpret_cast<const jchar*>(str), len); } static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */, |