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

Commit 250f8ef2 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Fix return type mismatch in Region's JNI code. 

bug: 7620006
Change-Id: Iddca9b3739b0c116a80a900e06cede338b868e17
parent 647abce5

core/jni/android/graphics/Region.cpp

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static JNINativeMethod gRegionMethods[] = { 
    // these are static methods

    { "nativeConstructor",      "()I",                              (void*)Region_constructor       },

    { "nativeDestructor",       "(I)V",                             (void*)Region_destructor        },

    { "nativeSetRegion",        "(II)Z",                            (void*)Region_setRegion         },

    { "nativeSetRegion",        "(II)V",                            (void*)Region_setRegion         },

    { "nativeSetRect",          "(IIIII)Z",                         (void*)Region_setRect           },

    { "nativeSetPath",          "(III)Z",                           (void*)Region_setPath           },

    { "nativeGetBounds",        "(ILandroid/graphics/Rect;)Z",      (void*)Region_getBounds         },

graphics/java/android/graphics/Region.java

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ public class Region implements Parcelable { 
    /** Set the region to the specified region.

    */

    public boolean set(Region region) {

        return nativeSetRegion(mNativeRegion, region.mNativeRegion);

        nativeSetRegion(mNativeRegion, region.mNativeRegion);

        return true;

    }



    /** Set the region to the specified rectangle
@@ -406,8 +407,7 @@ public class Region implements Parcelable { 
    private static native int nativeConstructor();

    private static native void nativeDestructor(int native_region);



    private static native boolean nativeSetRegion(int native_dst,

                                                  int native_src);

    private static native void nativeSetRegion(int native_dst, int native_src);

    private static native boolean nativeSetRect(int native_dst, int left,

                                                int top, int right, int bottom);

    private static native boolean nativeSetPath(int native_dst, int native_path,