summaryrefslogtreecommitdiffstats
path: root/core/jni/android_view_Surface.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-04-12 16:22:15 -0700
committerMathias Agopian <mathias@google.com>2010-04-12 16:29:36 -0700
commit8b138323d54e36fd66b22a634494648e20c53373 (patch)
treee403ffb6131b32a5156e5f9868e0ae1408c96128 /core/jni/android_view_Surface.cpp
parent5c7a69c3d6f41f60f4bfc3f7e3123941d382f3a7 (diff)
downloadframeworks_base-8b138323d54e36fd66b22a634494648e20c53373.zip
frameworks_base-8b138323d54e36fd66b22a634494648e20c53373.tar.gz
frameworks_base-8b138323d54e36fd66b22a634494648e20c53373.tar.bz2
don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface native surface. use a macro instead. Also rename the field to mNativeSurface. Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
Diffstat (limited to 'core/jni/android_view_Surface.cpp')
-rw-r--r--core/jni/android_view_Surface.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index ed26cbe..817f0c5 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -19,6 +19,7 @@
#include "android_util_Binder.h"
#include <surfaceflinger/SurfaceComposerClient.h>
+#include <surfaceflinger/Surface.h>
#include <ui/Region.h>
#include <ui/Rect.h>
@@ -670,7 +671,7 @@ static JNINativeMethod gSurfaceMethods[] = {
void nativeClassInit(JNIEnv* env, jclass clazz)
{
- so.surface = env->GetFieldID(clazz, "mSurface", "I");
+ so.surface = env->GetFieldID(clazz, ANDROID_VIEW_SURFACE_JNI_ID, "I");
so.surfaceControl = env->GetFieldID(clazz, "mSurfaceControl", "I");
so.saveCount = env->GetFieldID(clazz, "mSaveCount", "I");
so.canvas = env->GetFieldID(clazz, "mCanvas", "Landroid/graphics/Canvas;");