commit 44db6e1fa47ea438b7a482812aac91126fe331fb
author Amith Yamasani <yamasani@google.com> Wed Sep 22 16:29:49 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 22 16:29:49 2010 -0700
tree 267838fb32132eb4b1052124d3980dc77b655d8d
parent 7a311997046f48b0f0d1b6af9592b9dae6d1c2a2
parent 4a198dc08f7aad383f23399c1a99ccb09caa4489

Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread

opengl/libs/EGL/egl.cpp

diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index df21358..105ebb4 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -1344,16 +1344,18 @@
 EGLint eglGetError(void)
 {
     EGLint result = EGL_SUCCESS;
+    EGLint err;
     for (int i=0 ; i<IMPL_NUM_IMPLEMENTATIONS ; i++) {
-        EGLint err = EGL_SUCCESS;
+        err = EGL_SUCCESS;
         egl_connection_t* const cnx = &gEGLImpl[i];
         if (cnx->dso)
             err = cnx->egl.eglGetError();
         if (err!=EGL_SUCCESS && result==EGL_SUCCESS)
             result = err;
     }
+    err = getError();
     if (result == EGL_SUCCESS)
-        result = getError();
+        result = err;
     return result;
 }