summaryrefslogtreecommitdiffstats
path: root/media/jni
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 /media/jni
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 'media/jni')
-rw-r--r--media/jni/android_media_MediaPlayer.cpp2
-rw-r--r--media/jni/android_media_MediaRecorder.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 8ed3730..60ff264 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -636,7 +636,7 @@ android_media_MediaPlayer_native_init(JNIEnv *env)
return;
}
- fields.surface_native = env->GetFieldID(surface, "mSurface", "I");
+ fields.surface_native = env->GetFieldID(surface, ANDROID_VIEW_SURFACE_JNI_ID, "I");
if (fields.surface_native == NULL) {
jniThrowException(env, "java/lang/RuntimeException", "Can't find Surface.mSurface");
return;
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 00af3a2..8cf2e51 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -403,7 +403,7 @@ android_media_MediaRecorder_native_init(JNIEnv *env)
return;
}
- fields.surface_native = env->GetFieldID(surface, "mSurface", "I");
+ fields.surface_native = env->GetFieldID(surface, ANDROID_VIEW_SURFACE_JNI_ID, "I");
if (fields.surface_native == NULL) {
jniThrowException(env, "java/lang/RuntimeException", "Can't find Surface.mSurface");
return;