summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-02-13 19:55:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-13 19:55:52 -0800
commiteaf2617fc20dd6484722edc9df41faf6e91d73cc (patch)
tree4636be449efadb5e81aa55792c26920accaa86cf /core
parent07bebe8b12555ea0fb57729e8ee2e7efc343e7e2 (diff)
parent472512f6970fa170e2e1a3e1c24ac2b742e2e6b6 (diff)
downloadframeworks_base-eaf2617fc20dd6484722edc9df41faf6e91d73cc.zip
frameworks_base-eaf2617fc20dd6484722edc9df41faf6e91d73cc.tar.gz
frameworks_base-eaf2617fc20dd6484722edc9df41faf6e91d73cc.tar.bz2
am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6': Fix incorrect prototype for JNI call
Diffstat (limited to 'core')
-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);
}