summaryrefslogtreecommitdiffstats
path: root/core/jni/android_util_AssetManager.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-10 17:57:36 -0800
committerGlenn Kasten <gkasten@google.com>2012-01-11 13:40:05 -0800
commit129e19cb37b1d30f8c46f77a3853d347c3e78bb3 (patch)
treec7d7967bc091dc98f708fce16c1cdfefcdedf10c /core/jni/android_util_AssetManager.cpp
parent81754949e0110b9db44bef421d6282a3bf831138 (diff)
downloadframeworks_base-129e19cb37b1d30f8c46f77a3853d347c3e78bb3.zip
frameworks_base-129e19cb37b1d30f8c46f77a3853d347c3e78bb3.tar.gz
frameworks_base-129e19cb37b1d30f8c46f77a3853d347c3e78bb3.tar.bz2
Fix build warnings
Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9
Diffstat (limited to 'core/jni/android_util_AssetManager.cpp')
-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 6ecee35..17130af 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -434,12 +434,12 @@ static jint android_content_AssetManager_addAssetPath(JNIEnv* env, jobject clazz
{
ScopedUtfChars path8(env, path);
if (path8.c_str() == NULL) {
- return NULL;
+ return 0;
}
AssetManager* am = assetManagerForJavaObject(env, clazz);
if (am == NULL) {
- return JNI_FALSE;
+ return 0;
}
void* cookie;