commit 8a90666cccac19314216ab1ff8b99ecb854ccf04
author Jesse Hall <jessehall@google.com> Thu Mar 06 20:04:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 06 20:04:55 2014 +0000
tree e49c1afd499a600c89e620a72524691f41333a86
parent b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042
parent 282ab1b6b1a92b8cb2650c111bfab02916f8715d

am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"

* commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d':
  gralloc: dont hardcode 32bpp as RGBX

modules/gralloc/framebuffer.cpp

diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index 326f2ae..9d8513a 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -330,7 +330,7 @@
         if (status >= 0) {
             int stride = m->finfo.line_length / (m->info.bits_per_pixel >> 3);
             int format = (m->info.bits_per_pixel == 32)
-                         ? HAL_PIXEL_FORMAT_RGBX_8888
+                         ? (m->info.red.offset ? HAL_PIXEL_FORMAT_BGRA_8888 : HAL_PIXEL_FORMAT_RGBX_8888)
                          : HAL_PIXEL_FORMAT_RGB_565;
             const_cast<uint32_t&>(dev->device.flags) = 0;
             const_cast<uint32_t&>(dev->device.width) = m->info.xres;