commit cbd3789801af806b07ed54fb0a7b41f46b29e076
author Jesse Hall <jessehall@google.com> Thu Feb 21 22:10:15 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 21 22:10:15 2013 -0800
tree f4c07ff5445eb96abd6c3ea3f19dd91be120e257
parent be88cb1d6cb8bd451b764b966a6e68c09c8a187d
parent ab10f3c5b939f3d7afe6d5561d761fc5299572bc

am ab10f3c5: Merge "Restore a mistakenly-removed null check"

* commit 'ab10f3c5b939f3d7afe6d5561d761fc5299572bc':
  Restore a mistakenly-removed null check

core/jni/android_hardware_Camera.cpp

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 7c65662..c0e12da 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -537,7 +537,10 @@
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
-    sp<Surface> surface = android_view_Surface_getSurface(env, jSurface);
+    sp<Surface> surface;
+    if (jSurface) {
+        surface = android_view_Surface_getSurface(env, jSurface);
+    }
 
     if (camera->setPreviewDisplay(surface) != NO_ERROR) {
         jniThrowException(env, "java/io/IOException", "setPreviewDisplay failed");