commit 68f6f01cf62e0c282b570adf492352a5d4418584
author Android (Google) Code Review <android-gerrit@google.com> Thu Sep 10 12:20:49 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 10 12:20:49 2009 -0400
tree 3de2c156cdd0dc708619a46dc9a01ac3db1e9935
parent 657367185652f9877eb232b84e16fbed0d759f87
parent a7ef2698a6c9182ffd41574495a18da1ffc2be2c

Merge change 24527 into eclair

* changes:
  MountService: Use correct icon for SD card notifications.

camera/libcameraservice/CameraService.cpp

diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index e66b00f..3c2dc2b 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -552,17 +552,6 @@
     CameraParameters params(mHardware->getParameters());
     params.getPreviewSize(&w, &h);
 
-    const char *format = params.getPreviewFormat();
-    int fmt;
-    if (!strcmp(format, "yuv422i-yuyv"))
-        fmt = OVERLAY_FORMAT_YCbYCr_422_I;
-    else if (!strcmp(format, "rgb565"))
-        fmt = OVERLAY_FORMAT_RGB_565;
-    else {
-        LOGE("Invalid preview format for overlays");
-        return -EINVAL;
-    }
-
     if ( w != mOverlayW || h != mOverlayH )
     {
         // Force the destruction of any previous overlay
@@ -574,7 +563,7 @@
     status_t ret = NO_ERROR;
     if (mSurface != 0) {
         if (mOverlayRef.get() == NULL) {
-            mOverlayRef = mSurface->createOverlay(w, h, fmt);
+            mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);
             if ( mOverlayRef.get() == NULL )
             {
                 LOGE("Overlay Creation Failed!");