summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-10-09 16:52:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-09 16:52:37 -0700
commit0acb00c2d780b60ed3d71be256460375dd8715b4 (patch)
tree9a65837f215925cc82996ff2dba744031c2897fd /services
parentc5b58166e8170a415de108a72acfc432dec1b201 (diff)
parentb8fc00bfb41a61aeda186eec8f14522ff32f23f8 (diff)
downloadframeworks_native-0acb00c2d780b60ed3d71be256460375dd8715b4.zip
frameworks_native-0acb00c2d780b60ed3d71be256460375dd8715b4.tar.gz
frameworks_native-0acb00c2d780b60ed3d71be256460375dd8715b4.tar.bz2
Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index ff1af83..40631ee 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -233,7 +233,7 @@ void DisplayDevice::swapBuffers(HWComposer& hwc) const {
if (error == EGL_CONTEXT_LOST ||
mType == DisplayDevice::DISPLAY_PRIMARY) {
LOG_ALWAYS_FATAL("eglSwapBuffers(%p, %p) failed with 0x%08x",
- mDisplay, mSurface, eglGetError());
+ mDisplay, mSurface, error);
}
}
}