commit 689497fbd021400664c6348a8acc2810409b1f8e
author James Dong <jdong@google.com> Wed Jun 09 11:29:30 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 09 11:29:30 2010 -0700
tree 9f3e87112b5aae49989c74422c3c1801ee44f833
parent 34e5d967f4f8052e1909900a808b1ac931eb6914
parent 457d5ae3c9e40c8336b65ea954d1bd5ae1622917

am 457d5ae3: Fix a potential(observed sometimes) media server crash

media/jni/android_media_MediaRecorder.cpp

diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 3d90650..c113ffe 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -317,7 +317,7 @@
 
     jobject surface = env->GetObjectField(thiz, fields.surface);
     if (surface != NULL) {
-        const sp<Surface>& native_surface = get_surface(env, surface);
+        const sp<Surface> native_surface = get_surface(env, surface);
         LOGI("prepare: surface=%p (identity=%d)", native_surface.get(), native_surface->getIdentity());
         if (process_media_recorder_call(env, mr->setPreviewSurface(native_surface), "java/lang/RuntimeException", "setPreviewSurface failed.")) {
             return;