commit fb065fe01a7813e6356e0dbd4b54d102d3536072
author Yahan Zhou <yahan@google.com> Wed May 22 12:42:50 2019 -0700
committer Yahan Zhou <yahan@google.com> Wed May 22 21:01:07 2019 +0000
tree 42a09390d6deb04a22ae14847af84c497803ab1f
parent d50251d8439d22605c5abc7ae27473ab3a31f627

Fix eglQueryString

BUG: 131917822
Test: cts-tradefed run cts -m CtsDeqpTestCases -t dEQP-EGL.functional.choose_config.simple*
Change-Id: Idc82f469c606009eb0ace6f33ad9524b4a70877d

system/egl/egl.cpp

diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index b0b510b..60d17e5 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -920,7 +920,11 @@
 
 const char* eglQueryString(EGLDisplay dpy, EGLint name)
 {
-    VALIDATE_DISPLAY_INIT(dpy, NULL);
+    // EGL_BAD_DISPLAY is generated if display is not an EGL display connection, unless display is
+    // EGL_NO_DISPLAY and name is EGL_EXTENSIONS.
+    if (dpy || name != EGL_EXTENSIONS) {
+        VALIDATE_DISPLAY_INIT(dpy, NULL);
+    }
 
     return s_display.queryString(name);
 }