diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2009-06-23 23:37:36 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2009-07-01 01:41:25 +0800 |
| commit | b8a10fe45657f2dcc50cae8a06805f8438a6937e (patch) | |
| tree | 4391154a42118f9872199fa4467f966c623e29a5 /core/java/android/hardware | |
| parent | 33a7030f56d83126baa656820bf884ea02772751 (diff) | |
| download | frameworks_base-b8a10fe45657f2dcc50cae8a06805f8438a6937e.zip frameworks_base-b8a10fe45657f2dcc50cae8a06805f8438a6937e.tar.gz frameworks_base-b8a10fe45657f2dcc50cae8a06805f8438a6937e.tar.bz2 | |
Allow setPreviewDisplay after startPreview.
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 09fbc97..3ce951f 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -155,7 +155,11 @@ public class Camera { * @throws IOException if the method fails. */ public final void setPreviewDisplay(SurfaceHolder holder) throws IOException { - setPreviewDisplay(holder.getSurface()); + if (holder != null) { + setPreviewDisplay(holder.getSurface()); + } else { + setPreviewDisplay((Surface)null); + } } private native final void setPreviewDisplay(Surface surface); |