commit 1f82f1430513a48bfd3996e6dea3083437be07b2
author The Android Automerger <android-build@google.com> Sun Jun 19 01:07:48 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 19 01:07:48 2016 -0700
tree 7566e8cd54e91b50edfc491834ac2bfe604f3492
parent 7e1cc32d97c32a5dce5e978e8412d52b28eeab58
parent 424adad62e2c95f6f02aa8729e30dba1ef9de4e0

merge in nyc-mr1-release history after reset to nyc-mr1-dev

ISV/base/isv_bufmanager.cpp

diff --git a/ISV/base/isv_bufmanager.cpp b/ISV/base/isv_bufmanager.cpp
index f6376ce..3b02ab4 100644
--- a/ISV/base/isv_bufmanager.cpp
+++ b/ISV/base/isv_bufmanager.cpp
@@ -89,7 +89,7 @@
     mColorFormat = info.format;
 #else
     IMG_native_handle_t* grallocHandle = (IMG_native_handle_t*)mGrallocHandle;
-    mStride = grallocHandle->iWidth;
+    mStride = grallocHandle->aiStride[0];
     mSurfaceHeight = grallocHandle->iHeight;
     mColorFormat = (hackFormat != 0) ? hackFormat : grallocHandle->iFormat;
 #endif