diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-22 17:22:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-22 17:22:19 -0700 |
| commit | 9970bbac1f4951f5910aa5148e189a0a284f9e46 (patch) | |
| tree | 07e56758856d22832e257d1b05760c3ff7df2da7 /libs | |
| parent | ddf573d6091b99199bfde93a58ef51db796c7b0f (diff) | |
| parent | 3534e13486a0081b1229e698f13bd3a37efa3fb0 (diff) | |
| download | frameworks_base-9970bbac1f4951f5910aa5148e189a0a284f9e46.zip frameworks_base-9970bbac1f4951f5910aa5148e189a0a284f9e46.tar.gz frameworks_base-9970bbac1f4951f5910aa5148e189a0a284f9e46.tar.bz2 | |
am 3534e134: Merge "Avoid crash if onDetachedFromWindow called after destroy" into jb-dev
* commit '3534e13486a0081b1229e698f13bd3a37efa3fb0':
Avoid crash if onDetachedFromWindow called after destroy
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 3757cf0..2a8b32c 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -262,7 +262,6 @@ void OpenGLRenderer::resume() { } void OpenGLRenderer::detachFunctor(Functor* functor) { - ALOGD("opengl renderer %p detaching functor %p", this, functor); mFunctors.remove(functor); } @@ -310,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(); |