commit 33dd3b9dcaf88c94f5b0f9c27891a6080d1271f5
author android-build-team Robot <android-build-team-robot@google.com> Thu May 23 03:10:50 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 23 03:10:50 2019 +0000
tree 42a09390d6deb04a22ae14847af84c497803ab1f
parent c37a95962eabb82fe3434574a8b273205bdc4003
parent fb065fe01a7813e6356e0dbd4b54d102d3536072

Snap for 5595753 from fb065fe01a7813e6356e0dbd4b54d102d3536072 to qt-release

Change-Id: I788af55ac4c63b54367083c03b22febf800ca184

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);
 }