commit fed51cf487257ab90b6b1e3dfa25147192739b85
author Adam Bookatz <bookatz@google.com> Tue Nov 06 08:35:47 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 06 08:35:47 2018 +0000
tree b28b33974bf331e2fc5729a910718a4506c94d67
parent 3bd040ec0af39ef7772634ab96f496898faeedca
parent 3847214b5b0187e640133b0ac860f3ed5ddc6fb1

Merge "Statsd dump data and metadata to bugreport"

opengl/libs/EGL/egl_display.cpp

diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index 7cf58b4..a065973 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -265,7 +265,12 @@
             if (cnx->egl.eglGetPlatformDisplay) {
                 dpy = cnx->egl.eglGetPlatformDisplay(EGL_PLATFORM_ANDROID_KHR, display,
                                                      attrib_list);
-            } else {
+            }
+
+            // It is possible that eglGetPlatformDisplay does not have a
+            // working implementation for Android platform; in that case,
+            // one last fallback to eglGetDisplay
+            if(dpy == EGL_NO_DISPLAY) {
                 if (attrib_list) {
                     ALOGW("getPlatformDisplay: unexpected attribute list, attributes ignored");
                 }