summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2012-01-10 17:57:36 -0800
committer Glenn Kasten <gkasten@google.com> 2012-01-11 13:40:05 -0800
commit129e19cb37b1d30f8c46f77a3853d347c3e78bb3 (patch)
treec7d7967bc091dc98f708fce16c1cdfefcdedf10c
parent81754949e0110b9db44bef421d6282a3bf831138 (diff)
Fix build warnings
Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9
-rw-r--r--core/jni/android_util_AssetManager.cpp4
-rw-r--r--core/jni/android_util_Process.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 6ecee3579414..17130af39450 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;
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 2c494ac82ae2..8234f1bf6973 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -389,7 +389,7 @@ static jlong android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz)
jlong mem = 0;
static const char* const sums[] = { "MemFree:", "Cached:", NULL };
- static const int sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), NULL };
+ static const int sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), 0 };
char* p = buffer;
while (*p && numFound < 2) {