Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use JNI types for return types of JNI methods" into rvc-dev

Browse Source
This commit is contained in:
Jerome Gaillard
2020-05-26 19:40:12 +00:00
committed by Android (Google) Code Review
parent 12416fba4a a818713c5e
commit 77e1d06882
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/jni/android_graphics_Canvas.cpp
View File

@@ -113,7 +113,7 @@ static void restoreUnclippedLayer(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle,
get_canvas(canvasHandle)->restoreUnclippedLayer(saveCount, *paint); get_canvas(canvasHandle)->restoreUnclippedLayer(saveCount, *paint);
} }
static bool restore(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle) { static jboolean restore(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle) {
Canvas* canvas = get_canvas(canvasHandle); Canvas* canvas = get_canvas(canvasHandle);
if (canvas->getSaveCount() <= 1) { if (canvas->getSaveCount() <= 1) {
return false; // cannot restore anymore return false; // cannot restore anymore

2
libs/hwui/jni/android_graphics_drawable_VectorDrawable.cpp
View File

@@ -102,7 +102,7 @@ static void setAntiAlias(JNIEnv*, jobject, jlong treePtr, jboolean aa) {
/** /**
* Draw * Draw
*/ */
static int draw(JNIEnv* env, jobject, jlong treePtr, jlong canvasPtr, static jint draw(JNIEnv* env, jobject, jlong treePtr, jlong canvasPtr,
jlong colorFilterPtr, jobject jrect, jboolean needsMirroring, jboolean canReuseCache) { jlong colorFilterPtr, jobject jrect, jboolean needsMirroring, jboolean canReuseCache) {
VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(treePtr); VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(treePtr);
Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr);

10
libs/hwui/jni/android_util_PathParser.cpp
View File

@@ -39,18 +39,18 @@ static void parseStringForPath(JNIEnv* env, jobject, jlong skPathHandle, jstring
} }
} }
static long createEmptyPathData(JNIEnv*, jobject) { static jlong createEmptyPathData(JNIEnv*, jobject) {
PathData* pathData = new PathData(); PathData* pathData = new PathData();
return reinterpret_cast<jlong>(pathData); return reinterpret_cast<jlong>(pathData);
} }
static long createPathData(JNIEnv*, jobject, jlong pathDataPtr) { static jlong createPathData(JNIEnv*, jobject, jlong pathDataPtr) {
PathData* pathData = reinterpret_cast<PathData*>(pathDataPtr); PathData* pathData = reinterpret_cast<PathData*>(pathDataPtr);
PathData* newPathData = new PathData(*pathData); PathData* newPathData = new PathData(*pathData);
return reinterpret_cast<jlong>(newPathData); return reinterpret_cast<jlong>(newPathData);
} }
static long createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr, jint strLength) { static jlong createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr, jint strLength) {
const char* pathString = env->GetStringUTFChars(inputStr, NULL); const char* pathString = env->GetStringUTFChars(inputStr, NULL);
PathData* pathData = new PathData(); PathData* pathData = new PathData();
PathParser::ParseResult result; PathParser::ParseResult result;
@@ -65,7 +65,7 @@ static long createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr,
} }
} }
static bool interpolatePathData(JNIEnv*, jobject, jlong outPathDataPtr, jlong fromPathDataPtr, static jboolean interpolatePathData(JNIEnv*, jobject, jlong outPathDataPtr, jlong fromPathDataPtr,
jlong toPathDataPtr, jfloat fraction) { jlong toPathDataPtr, jfloat fraction) {
PathData* outPathData = reinterpret_cast<PathData*>(outPathDataPtr); PathData* outPathData = reinterpret_cast<PathData*>(outPathDataPtr);
PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr); PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);
@@ -79,7 +79,7 @@ static void deletePathData(JNIEnv*, jobject, jlong pathDataHandle) {
delete pathData; delete pathData;
} }
static bool canMorphPathData(JNIEnv*, jobject, jlong fromPathDataPtr, jlong toPathDataPtr) { static jboolean canMorphPathData(JNIEnv*, jobject, jlong fromPathDataPtr, jlong toPathDataPtr) {
PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr); PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);
PathData* toPathData = reinterpret_cast<PathData*>(toPathDataPtr); PathData* toPathData = reinterpret_cast<PathData*>(toPathDataPtr);
return VectorDrawableUtils::canMorph(*fromPathData, *toPathData); return VectorDrawableUtils::canMorph(*fromPathData, *toPathData);