Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9830d43 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix build warnings"

parents 80f3fc2c 129e19cb

core/jni/android_util_AssetManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/jni/android_util_Process.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {