summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-10-15 01:07:03 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-10-15 01:07:03 +0200
commit2402d58e15d51869c5e7e58439170918506a52c7 (patch)
tree7480e510c4380a1aacad785664e0534edfc1d76e
parent7761b5c89df9e79a57800e2c3a5acaa08d5bc880 (diff)
downloadbase-linaro_android_4.1.2.tar.gz
base: Fix build after Parcel ABI fix in Binderlinaro_android_4.1.2
Adapt code to the fact that writeString16's first parameter is now an uint16_t* to match the old ABI Change-Id: I138af645c877f343f0490152b9702698b7d36582 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--core/jni/android_os_Parcel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp
index 6504e61b0a64..9641b35015ad 100644
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -237,7 +237,7 @@ static void android_os_Parcel_writeString(JNIEnv* env, jclass clazz, jint native
if (val) {
const jchar* str = env->GetStringCritical(val, 0);
if (str) {
- err = parcel->writeString16((char16_t*)str, env->GetStringLength(val));
+ err = parcel->writeString16((uint16_t*)str, env->GetStringLength(val));
env->ReleaseStringCritical(val, str);
}
} else {