Merge "Return 0 instead of NULL for jlong" am: c3e03c1c3d am: 28dc02a29b am: ee32f1583f am: 0e5d78d7de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945491 Change-Id: Ic0ef3248024ecd92f639936b6c09b10a2d1eb9cd
This commit is contained in:
@@ -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];
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user