commit 4c119fc0d597e5b88dd25b8bc51c6f5e4c03cde6
author Craig Donner <cdonner@google.com> Mon Jun 13 16:49:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 13 16:49:25 2016 +0000
tree 48d073a6ba030672481489bcf12d39d8385b107d
parent 17421c5fa9a19ca3c57da88d744f3538e0f4ea62
parent 518e336d3fd81d2819fa2188d6ff1635995182ef

Merge \"Fix assignment of 565 format when creating native client buffers.\" into nyc-dev
am: 518e336d3f

Change-Id: I3ff59132bd91b02a62beddc78713e2cea7798db2

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 24394a9..e793852 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -1847,7 +1847,7 @@
         }
     } else if (red_size == 5 && green_size == 6 && blue_size == 5 &&
                alpha_size == 0) {
-        format == HAL_PIXEL_FORMAT_RGB_565;
+        format = HAL_PIXEL_FORMAT_RGB_565;
     } else {
         ALOGE("Invalid native pixel format { r=%d, g=%d, b=%d, a=%d }",
                 red_size, green_size, blue_size, alpha_size);