diff options
| author | Jesse Hall <jessehall@google.com> | 2013-02-21 15:06:27 -0800 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-02-21 15:06:27 -0800 |
| commit | aa70f2217cd01e4f09e35c3bf450b20682563378 (patch) | |
| tree | ce917ed4dc4cac649abfeea5767443d7736d7fa7 /core/jni/android_hardware_Camera.cpp | |
| parent | e96558879ec7008ddf5647ad29d69ec1fad68c67 (diff) | |
| download | frameworks_base-aa70f2217cd01e4f09e35c3bf450b20682563378.zip frameworks_base-aa70f2217cd01e4f09e35c3bf450b20682563378.tar.gz frameworks_base-aa70f2217cd01e4f09e35c3bf450b20682563378.tar.bz2 | |
Restore a mistakenly-removed null check
Passing null to camera.setPreviewDisplay() needs to work; this
restores the behavior from before the Surface/SurfaceControl
refactoring.
Bug: 8225538
Change-Id: Ib73bfa9fe53457a41a69b7fe5dfff3a3aa260f52
Diffstat (limited to 'core/jni/android_hardware_Camera.cpp')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ static void android_hardware_Camera_setPreviewDisplay(JNIEnv *env, jobject thiz, 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"); |