Merge "Add more temporary logging for investigating detachFunctor" into jb-dev

3 files changed, 9 insertions, 3 deletions

diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index 7e86ea3..c0d76cf 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -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
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 3138692..6c24b86 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -678,6 +678,9 @@ 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);
         }
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 2dc9726..c5fedba 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -262,7 +262,10 @@ void OpenGLRenderer::resume() {
 }
 
 void OpenGLRenderer::detachFunctor(Functor* functor) {
-    mFunctors.remove(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);
 }
 
 void OpenGLRenderer::attachFunctor(Functor* functor) {
@@ -309,7 +312,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
 
 status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
     interrupt();
-    detachFunctor(functor);
+    mFunctors.remove(functor);
 
     if (mDirtyClip) {
         setScissorFromClip();