summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-02-13 20:00:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-13 20:00:40 -0800
commit6466f400a40224dc113eb6d06009a1c655151045 (patch)
treed075d1abfaa053d581ae1c457f35ffa1a14d3290
parent8885596a9109794ebd61e6a91e5199aa1750ed8c (diff)
parentfca4ff3851508d9d2c414aa535a86d7ac0eb5e72 (diff)
downloadframeworks_base-6466f400a40224dc113eb6d06009a1c655151045.zip
frameworks_base-6466f400a40224dc113eb6d06009a1c655151045.tar.gz
frameworks_base-6466f400a40224dc113eb6d06009a1c655151045.tar.bz2
am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit 'fca4ff3851508d9d2c414aa535a86d7ac0eb5e72': Fix incorrect prototype for JNI call
-rw-r--r--core/jni/android_view_Surface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index bba4b47..18bcea1 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -572,7 +572,7 @@ static jobject Surface_screenshotAll(JNIEnv* env, jobject clazz, jint width, jin
}
static jobject Surface_screenshot(JNIEnv* env, jobject clazz, jint width, jint height,
- jint minLayer, jint maxLayer, bool allLayers)
+ jint minLayer, jint maxLayer)
{
return doScreenshot(env, clazz, width, height, minLayer, maxLayer, false);
}