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

Commit 831bf634 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return 0 instead of NULL for jlong" am: c3e03c1c am: 28dc02a2 am:... 

Merge "Return 0 instead of NULL for jlong" am: c3e03c1c am: 28dc02a2 am: ee32f158 am: 0e5d78d7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945491

Change-Id: Ic0ef3248024ecd92f639936b6c09b10a2d1eb9cd
parents cd599a96 0e5d78d7

libs/hwui/jni/NinePatch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
        size_t chunkSize = obj != NULL ? env->GetArrayLength(obj) : 0;

        if (chunkSize < (int) (sizeof(Res_png_9patch))) {

            jniThrowRuntimeException(env, "Array too small for chunk.");

            return NULL;

            return 0;

        }



        int8_t* storage = new int8_t[chunkSize];

libs/hwui/jni/android_util_PathParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static jlong createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr 
    } else {

        delete pathData;

        doThrowIAE(env, result.failureMessage.c_str());

        return NULL;

        return 0;

    }

}