summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-10 19:35:04 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-10 19:35:04 +0200
commit2ffb2d8ce6b2f651695fa44e1313746a0568ab79 (patch)
treeadbeb9a77d4dfc1f6f6a06ca6dadd4c3648b0546
parent96429bbe1ea023579937fc45115a226b99e5bf55 (diff)
downloadbase-2ffb2d8ce6b2f651695fa44e1313746a0568ab79.tar.gz
frameworks/base: Fix build without ISO C++11
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--core/jni/android_util_AssetManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index f8d6e185bd74..bef1540df0fd 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -565,11 +565,11 @@ static jint android_content_AssetManager_getResourceIdentifier(JNIEnv* env, jobj
const char16_t* defType16 = defType
? (char16_t*)env->GetStringChars(defType, NULL) : NULL;
jsize defTypeLen = defType
- ? (char16_t*)env->GetStringLength(defType) : 0;
+ ? env->GetStringLength(defType) : 0;
const char16_t* defPackage16 = defPackage
? (char16_t*)env->GetStringChars(defPackage, NULL) : NULL;
jsize defPackageLen = defPackage
- ? (char16_t*)env->GetStringLength(defPackage) : 0;
+ ? env->GetStringLength(defPackage) : 0;
jint ident = am->getResources().identifierForName(
name16.get(), name16.size(), defType16, defTypeLen, defPackage16, defPackageLen);