commit d0351a67f17d93038c17955381c5eff3d0679268
author Derek Sollenberger <djsollen@google.com> Mon Feb 04 05:24:49 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 04 05:24:49 2013 -0800
tree fb75ce7780b9b463cceba054717679f49ff89eea
parent 71ce407b660fc61324f281334fe09ffb0432d361
parent 1bce2db3b4ac17156066646171c82731c87aa4d1

am 1bce2db3: Merge "Fix return type mismatch in Region\'s JNI code."

# Via Android (Google) Code Review (1) and Derek Sollenberger (1)
* commit '1bce2db3b4ac17156066646171c82731c87aa4d1':
  Fix return type mismatch in Region's JNI code.

core/jni/android/graphics/Region.cpp

diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp
index b0262a2..ded2186 100644
--- a/core/jni/android/graphics/Region.cpp
+++ b/core/jni/android/graphics/Region.cpp
@@ -255,7 +255,7 @@
     // 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

diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java
index 9773039..72d0c43 100644
--- a/graphics/java/android/graphics/Region.java
+++ b/graphics/java/android/graphics/Region.java
@@ -87,7 +87,8 @@
     /** 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 @@
     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,