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

Commit 4e772cb9 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am 6d99a024: am 8f1f714f: Merge "Revert "Add more temporary logging for... 

am 6d99a024: am 8f1f714f: Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev

* commit '6d99a024':
  Revert "Add more temporary logging for investigating detachFunctor"
parents 7c8db6dd 6d99a024

core/java/android/view/HardwareRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ public abstract class HardwareRenderer { 
        void detachFunctor(int functor) {

            if (mCanvas != null) {

                mCanvas.detachFunctor(functor);

            } else Log.e(LOG_TAG, "can't detachFunctor, have no canvas");

            }

        }



        @Override

core/java/android/view/ViewRootImpl.java

+0 −3
Original line number Diff line number Diff line
@@ -678,9 +678,6 @@ public final class ViewRootImpl implements ViewParent, 
    }



    public void detachFunctor(int functor) {

        Log.e(HardwareRenderer.LOG_TAG, String.format("detachFunctor, mHarwareRenderer==null %b, enabled %b",

                mAttachInfo.mHardwareRenderer == null,

                mAttachInfo.mHardwareRenderer == null ? false : mAttachInfo.mHardwareRenderer.isEnabled()));

        if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {

            mAttachInfo.mHardwareRenderer.detachFunctor(functor);

        }

libs/hwui/OpenGLRenderer.cpp

+2 −5
Original line number Diff line number Diff line
@@ -262,10 +262,7 @@ void OpenGLRenderer::resume() { 
}



void OpenGLRenderer::detachFunctor(Functor* functor) {

    int size = mFunctors.size();

    int remove = mFunctors.remove(functor);

    ALOGD("OGLR %p detachFunctor %p, removed at index %d of %d",

          this, functor, remove, size);

    mFunctors.remove(functor);

}



void OpenGLRenderer::attachFunctor(Functor* functor) {
@@ -312,7 +309,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) { 


status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {

    interrupt();

    mFunctors.remove(functor);

    detachFunctor(functor);



    if (mDirtyClip) {

        setScissorFromClip();