Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89254c98 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Better logging of out of memory errors in OpenGLRenderer." into honeycomb

parents 19b78d94 a07105b7

core/java/android/view/ViewRoot.java

+0 −5
Original line number Diff line number Diff line
@@ -1073,11 +1073,6 @@ public final class ViewRoot extends Handler implements ViewParent, 
                            }

                        }

                        surfaceChanged = true;



                        if (mAttachInfo.mHardwareRenderer != null) {

                            // This will bail out early if already initialized

                            mAttachInfo.mHardwareRenderer.initialize(mHolder);

                        }

                    }

                    if (surfaceChanged) {

                        mSurfaceHolderCallback.surfaceChanged(mSurfaceHolder,

libs/hwui/OpenGLRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ void OpenGLRenderer::finish() { 
    GLenum status = GL_NO_ERROR;

    while ((status = glGetError()) != GL_NO_ERROR) {

        LOGD("GL error from OpenGLRenderer: 0x%x", status);

        switch (status) {

            case GL_OUT_OF_MEMORY:

                LOGE("  OpenGLRenderer is out of memory!");

                break;

        }

    }

#endif

#if DEBUG_MEMORY_USAGE