If we fail to create a window surface with sRGB, try again without.

tools/viewer/sk_app/android/GLWindowContext_android.cpp

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <GLES/gl.h> 
 
@@ skipping 68 matching lines @@
     SkASSERT(numConfigs > 0);
 
     static const EGLint kEGLContextAttribsForOpenGLES[] = {
         EGL_CONTEXT_CLIENT_VERSION, 2,
         EGL_NONE
     };
     fEGLContext = eglCreateContext(
             fDisplay, surfaceConfig, nullptr, kEGLContextAttribsForOpenGLES);
     SkASSERT(EGL_NO_CONTEXT != fEGLContext);
 
+//    SkDebugf("EGL: %d.%d", majorVersion, minorVersion);
+//    SkDebugf("Vendor: %s", eglQueryString(fDisplay, EGL_VENDOR));
+//    SkDebugf("Extensions: %s", eglQueryString(fDisplay, EGL_EXTENSIONS));
+
     // These values are the same as the corresponding VG colorspace attributes,
     // which were accepted starting in EGL 1.2. For some reason in 1.4, sRGB
     // became hidden behind an extension, but it looks like devices aren't
     // advertising that extension (including Nexus 5X). So just check version?
     const EGLint srgbWindowAttribs[] = {
         /*EGL_GL_COLORSPACE_KHR*/ 0x309D, /*EGL_GL_COLORSPACE_SRGB_KHR*/ 0x3089,
         EGL_NONE,
     };
     const EGLint* windowAttribs = nullptr;
     if (kSRGB_SkColorProfileType == params.fProfileType && majorVersion == 1 && minorVersion >= 2) {
         windowAttribs = srgbWindowAttribs;
     }
 
-    fSurface = eglCreateWindowSurface(
-            fDisplay, surfaceConfig, fNativeWindow, windowAttribs);
+    fSurface = eglCreateWindowSurface(fDisplay, surfaceConfig, fNativeWindow, windowAttribs);
+    if (EGL_NO_SURFACE == fSurface && windowAttribs) {
+        // Try again without sRGB
+        fSurface = eglCreateWindowSurface(fDisplay, surfaceConfig, fNativeWindow, nullptr);
+    }
     SkASSERT(EGL_NO_SURFACE != fSurface);
 
     SkAssertResult(eglMakeCurrent(fDisplay, fSurface, fSurface, fEGLContext));
     // GLWindowContext::initializeContext will call GrGLCreateNativeInterface so we
     // won't call it here.
 
     glClearStencil(0);
     glClearColor(0, 0, 0, 0);
     glStencilMask(0xffffffff);
     glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ skipping 18 matching lines @@
     fSurface = EGL_NO_SURFACE;
 }
 
 void GLWindowContext_android::onSwapBuffers() {
     if (fDisplay && fEGLContext && fSurface) {
         eglSwapBuffers(fDisplay, fSurface);
     }
 }
 
 }