| commit | eca06e92c77ecb23a79eeaa07a8a06a5926ccec2 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed Jun 15 00:03:57 2016 -0700 |
| committer | The Android Automerger <android-build@google.com> | Wed Jun 15 00:03:57 2016 -0700 |
| tree | 88cebe2373ee7a40319e55e709fa632769b025cb | |
| parent | b7d1a389b00370fc9d2a7db1268ce26271ead7e2 [diff] | |
| parent | 448ed1407dc25612f2a9b1d3655b02c0a1854a6c [diff] |
merge in nyc-release history after reset to nyc-dev
diff --git a/msm8994/libgralloc/mapper.cpp b/msm8994/libgralloc/mapper.cpp index c6a1d68..90fe3e9 100644 --- a/msm8994/libgralloc/mapper.cpp +++ b/msm8994/libgralloc/mapper.cpp
@@ -113,7 +113,10 @@ //Allow mapping of metadata for all buffers including secure ones, but not //of framebuffer - err = gralloc_map_metadata(handle); + int metadata_err = gralloc_map_metadata(handle); + if(!err) { + err = metadata_err; + } return err; }