commit 5468b1e0eb5f6a11f1dfbf91b2f129fe0b3395f1
author Yiwei Zhang <zzyiwei@google.com> Fri Nov 02 01:22:32 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 02 01:22:32 2018 -0700
tree 5800dc5377d87992e401c761bfdcf1cf9825f853
parent b76aac700b6581093c44c6741db7abadc6ea8d04
parent 35f1cdccf944b2330bdb2b49f07db19752cc9961

Merge "EGL: always set data space even for UNKNOWN" am: 1eb32e2ffd
am: 35f1cdccf9

Change-Id: I76a3854882c54e786c67cf995c9899c3493fb3c1

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 11029c5..36deedc 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -745,14 +745,14 @@
         }
 
         android_dataspace dataSpace = dataSpaceFromEGLColorSpace(colorSpace);
-        if (dataSpace != HAL_DATASPACE_UNKNOWN) {
-            int err = native_window_set_buffers_data_space(window, dataSpace);
-            if (err != 0) {
-                ALOGE("error setting native window pixel dataSpace: %s (%d)",
-                      strerror(-err), err);
-                native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);
-                return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);
-            }
+        // Set dataSpace even if it could be HAL_DATASPACE_UNKNOWN. HAL_DATASPACE_UNKNOWN
+        // is the default value, but it may have changed at this point.
+        int err = native_window_set_buffers_data_space(window, dataSpace);
+        if (err != 0) {
+            ALOGE("error setting native window pixel dataSpace: %s (%d)",
+                  strerror(-err), err);
+            native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);
+            return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);
         }
 
         // the EGL spec requires that a new EGLSurface default to swap interval