commit ca16bf276799867fa1a0d39764a9807f797f7df1
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Dec 22 06:22:43 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Dec 22 06:22:43 2017 -0800
tree f689ba08a7703825a3ba83ad8ccf300c97d5bfb6
parent 99fbabfbeeed4cf5e8cbc16233211f8f7aef7606
parent cd30d49ee21fd874feccb27e149b2934118b965f

Merge "gralloc1: Get color space from metadata handle"

libgralloc1/gr_buf_mgr.cpp

diff --git a/libgralloc1/gr_buf_mgr.cpp b/libgralloc1/gr_buf_mgr.cpp
index 9974834..c5d91d9 100644
--- a/libgralloc1/gr_buf_mgr.cpp
+++ b/libgralloc1/gr_buf_mgr.cpp
@@ -692,8 +692,11 @@
             break;
         }
         break;
+      } else if (getMetaData(hnd, GET_COLOR_SPACE, color_space) != 0) {
+          *color_space = 0;
       }
-      if (getMetaData(hnd, GET_COLOR_SPACE, &color_metadata) != 0) {
+#else
+      if (getMetaData(hnd, GET_COLOR_SPACE, color_space) != 0) {
           *color_space = 0;
       }
 #endif