commit 1581101ce2a8c1b8d0b07b643ad891595221d781
author Igor Murashkin <iam@google.com> Mon Jul 29 12:25:59 2013 -0700
committer Igor Murashkin <iam@google.com> Mon Jul 29 12:25:59 2013 -0700
tree 31ddd4257df3a28c066fdbe40586451c595612ab
parent de7c96afc382ac73108116d3431342633fa4e489

camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINED

Bug: 9487482
Change-Id: I09d3b4e41454d350c4bc7b1f8e893c3dad655e73

services/camera/libcameraservice/photography/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/photography/CameraDeviceClient.cpp b/services/camera/libcameraservice/photography/CameraDeviceClient.cpp
index e1c7e79..485c843 100644
--- a/services/camera/libcameraservice/photography/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/photography/CameraDeviceClient.cpp
@@ -325,8 +325,8 @@
 
     // FIXME: remove this override since the default format should be
     //       IMPLEMENTATION_DEFINED. b/9487482
-    if (format != HAL_PIXEL_FORMAT_BLOB &&
-        format != HAL_PIXEL_FORMAT_YCbCr_420_888) {
+    if (format >= HAL_PIXEL_FORMAT_RGBA_8888 &&
+        format <= HAL_PIXEL_FORMAT_BGRA_8888) {
         ALOGW("%s: Camera %d: Overriding format 0x%x to IMPLEMENTATION_DEFINED",
               __FUNCTION__, mCameraId, format);
         format = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;