commit 75cea2fe76d55a0692007e039091cb3c3adb0844
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 06 06:20:37 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 06 06:20:37 2014 -0800
tree b20435f1dd2c79f4013ad1ce352b971801672d4c
parent 325d49b6584ef9fa1251eeaf70a53832ba86330e
parent cdb4fd513c2443bbbfb4e4aa360bcc79c366e828

Merge "gralloc: Set default value for implementation defined formats"

libgralloc/gpu.cpp

diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index da179f9..bb7060b 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -282,13 +282,9 @@
             grallocFormat = HAL_PIXEL_FORMAT_YCrCb_420_SP; //NV21
         else if(usage & GRALLOC_USAGE_HW_CAMERA_WRITE)
             grallocFormat = HAL_PIXEL_FORMAT_YCrCb_420_SP; //NV21
-    }
-
-    if (format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED &&
-            (usage & GRALLOC_USAGE_HW_COMPOSER )) {
-        //XXX: If we still haven't set a format, default to
-        //RGBA8888
-        grallocFormat = HAL_PIXEL_FORMAT_RGBA_8888;
+        else if(usage & GRALLOC_USAGE_HW_COMPOSER)
+            //XXX: If we still haven't set a format, default to RGBA8888
+            grallocFormat = HAL_PIXEL_FORMAT_RGBA_8888;
     }
 
     getGrallocInformationFromFormat(grallocFormat, &bufferType);