Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev (8f1f714f) · Commits · e / os / android_frameworks_base

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

+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);
		}

+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();