commit 6641c325476be1057c374efaf7da6827ee430074
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 16 12:07:26 2010 -0700
committer Android Code Review <code-review@android.com> Mon Aug 16 12:07:26 2010 -0700
tree 974c4b074840deffb962750b8fd5294249ca4d6a
parent 0e0163ee5dd276e464c3027cb8e37dfb64e9c38f
parent 812a5686dfc217d8fe76eafda0f70feb34aa6e39

Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""

opengl/libs/EGL/egl.cpp

diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 40317e7..de740a3 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -843,10 +843,13 @@
     EGLint patch_index = -1;
     GLint attr;
     size_t size = 0;
-    while ((attr=attrib_list[size]) != EGL_NONE) {
-        if (attr == EGL_CONFIG_ID)
-            patch_index = size;
-        size += 2;
+
+    if (attrib_list != NULL) {
+        while ((attr=attrib_list[size]) != EGL_NONE) {
+            if (attr == EGL_CONFIG_ID)
+                patch_index = size;
+            size += 2;
+        }
     }
     if (patch_index >= 0) {
         size += 2; // we need copy the sentinel as well