am fca4ff3: am eaf2617: am 472512f: Merge "Fix incorrect prototype for JNI call"

Jean-Baptiste Queru · Android Git Automerger · commit 6466f400a402 · 2012-02-13T20:00:40.000-08:00
* commit 'fca4ff3851508d9d2c414aa535a86d7ac0eb5e72':
  Fix incorrect prototype for JNI call
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ static jobject Surface_screenshotAll(JNIEnv* env, jobject clazz, jint width, jin`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`static jobject Surface_screenshot(JNIEnv* env, jobject clazz, jint width, jint height,`
`575`		`- jint minLayer, jint maxLayer, bool allLayers)`
	`575`	`+ jint minLayer, jint maxLayer)`
`576`	`576`	`{`
`577`	`577`	`return doScreenshot(env, clazz, width, height, minLayer, maxLayer, false);`
`578`	`578`	`}`