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 /libs | |
| 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 'libs')
| -rw-r--r-- | libs/ui/Camera.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp index bb22dab..a481ce7 100644 --- a/libs/ui/Camera.cpp +++ b/libs/ui/Camera.cpp @@ -149,21 +149,21 @@ status_t Camera::unlock() status_t Camera::setPreviewDisplay(const sp<Surface>& surface) { LOGV("setPreviewDisplay"); - if (surface == 0) { - LOGE("app passed NULL surface"); - return NO_INIT; - } sp <ICamera> c = mCamera; if (c == 0) return NO_INIT; - return c->setPreviewDisplay(surface->getISurface()); + if (surface != 0) { + return c->setPreviewDisplay(surface->getISurface()); + } else { + LOGD("app passed NULL surface"); + return c->setPreviewDisplay(0); + } } status_t Camera::setPreviewDisplay(const sp<ISurface>& surface) { LOGV("setPreviewDisplay"); if (surface == 0) { - LOGE("app passed NULL surface"); - return NO_INIT; + LOGD("app passed NULL surface"); } sp <ICamera> c = mCamera; if (c == 0) return NO_INIT; @@ -171,7 +171,7 @@ status_t Camera::setPreviewDisplay(const sp<ISurface>& surface) } -// start preview mode, must call setPreviewDisplay first +// start preview mode status_t Camera::startPreview() { LOGV("startPreview"); |