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:
Treehugger Robot
2022-01-13 01:14:34 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -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];

View File

@@ -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;
}
}