diff options
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android_util_Process.cpp | 2 |
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) { |