commit 5fe0aac688cc68385ebcc60078c48d2c1694ce79
author John Reck <jreck@google.com> Tue Aug 04 19:45:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 04 19:45:28 2015 +0000
tree 2444ed84ef416cb80057e047b9f2ee0f5d76fbf4
parent c530e77831b3cf1b5dfaa03cb06f812160941fb3
parent 70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04

am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext

libs/hwui/renderstate/RenderState.cpp

diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index 3ebd57b..1e39bfa 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -124,9 +124,15 @@
 }
 
 void RenderState::invokeFunctor(Functor* functor, DrawGlInfo::Mode mode, DrawGlInfo* info) {
-    interruptForFunctorInvoke();
-    (*functor)(mode, info);
-    resumeFromFunctorInvoke();
+    if (mode == DrawGlInfo::kModeProcessNoContext) {
+        // If there's no context we don't need to interrupt as there's
+        // no gl state to save/restore
+        (*functor)(mode, info);
+    } else {
+        interruptForFunctorInvoke();
+        (*functor)(mode, info);
+        resumeFromFunctorInvoke();
+    }
 }
 
 void RenderState::interruptForFunctorInvoke() {