diff options
| author | Derek Sollenberger <djsollen@google.com> | 2013-02-04 05:24:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 05:24:49 -0800 |
| commit | d0351a67f17d93038c17955381c5eff3d0679268 (patch) | |
| tree | fb75ce7780b9b463cceba054717679f49ff89eea /core/jni | |
| parent | 71ce407b660fc61324f281334fe09ffb0432d361 (diff) | |
| parent | 1bce2db3b4ac17156066646171c82731c87aa4d1 (diff) | |
| download | frameworks_base-d0351a67f17d93038c17955381c5eff3d0679268.zip frameworks_base-d0351a67f17d93038c17955381c5eff3d0679268.tar.gz frameworks_base-d0351a67f17d93038c17955381c5eff3d0679268.tar.bz2 | |
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.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android/graphics/Region.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 }, |