commit a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069
author John Reck <jreck@google.com> Thu Dec 04 13:41:04 2014 -0800
committer John Reck <jreck@google.com> Thu Dec 04 13:41:04 2014 -0800
tree aef030b2f3b65e829e3569a0b0304b609f1c856c
parent 1c88fc009fb3f7a3b5f085abb6a40cf4d845d662
parent a51a0901ada5e2bc472c379a39df13ff48e666ed

resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp

Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 6fdf65e6..5aeecd2 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -123,8 +123,8 @@
     setSurface(window);
 }
 
-void CanvasContext::pauseSurface(ANativeWindow* /* window */) {
-    stopDrawing();
+bool CanvasContext::pauseSurface(ANativeWindow* /* window */) {
+    return mRenderThread.removeFrameCallback(this);
 }
 
 // TODO: don't pass viewport size, it's automatic via EGL