Merge "Making the setSurface non-static"

psanketi · Android (Google) Code Review · commit 1645ee2473e6 · 2012-04-17T11:42:48.000-07:00
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
@@ -198,7 +198,7 @@ sp<Surface> Surface_getSurface(JNIEnv* env, jobject clazz) {
     return surface;
 }
 
-static void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface)
+void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface)
 {
     Surface* const p = (Surface*)env->GetIntField(clazz, so.surface);
     if (surface.get()) {

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ sp<Surface> Surface_getSurface(JNIEnv* env, jobject clazz) {`
`198`	`198`	`return surface;`
`199`	`199`	`}`
`200`	`200`
`201`		`-static void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface)`
	`201`	`+void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface)`
`202`	`202`	`{`
`203`	`203`	`Surface* const p = (Surface*)env->GetIntField(clazz, so.surface);`
`204`	`204`	`if (surface.get()) {`