commit 00a89a8b6b5b0af894442bbcec030bd4d206300e
author The Android Automerger <android-build@google.com> Thu Jul 02 01:01:56 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jul 02 01:01:56 2015 -0700
tree ba54b3a1fd5123470cdbf79f90ee30e40f0b5b8f
parent ec57836a8607441597830610a929b87629399751
parent 2ae0941eabff0aea5e516c3511c7aabfe41d9261

merge in mnc-release history after reset to mnc-dev

msm8994/libgralloc/alloc_controller.cpp

diff --git a/msm8994/libgralloc/alloc_controller.cpp b/msm8994/libgralloc/alloc_controller.cpp
index 5da016a..4cb1661 100644
--- a/msm8994/libgralloc/alloc_controller.cpp
+++ b/msm8994/libgralloc/alloc_controller.cpp
@@ -160,11 +160,13 @@
     {
         case HAL_PIXEL_FORMAT_YCrCb_420_SP:
         case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
-        case HAL_PIXEL_FORMAT_RAW16:
             aligned_w = ALIGN(width, 32);
             break;
+        case HAL_PIXEL_FORMAT_RAW16:
+            aligned_w = ALIGN(width, 16);
+            break;
         case HAL_PIXEL_FORMAT_RAW10:
-            aligned_w = ALIGN(width * 10 /8, 16);
+            aligned_w = ALIGN(width * 10 /8, 8);
             break;
         case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
             aligned_w = ALIGN(width, 128);