diff options
| author | John Reck <jreck@google.com> | 2014-12-04 13:51:41 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-12-04 13:51:41 -0800 |
| commit | 9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f (patch) | |
| tree | 23fe00a35b718051d190f018ed8603d0c06acb14 /libs/hwui/renderthread/CanvasContext.cpp | |
| parent | e1a96f7fe217ccc610bd3cfb4e9a66630c816571 (diff) | |
| parent | a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069 (diff) | |
| download | frameworks_base-9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f.zip frameworks_base-9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f.tar.gz frameworks_base-9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f.tar.bz2 | |
resolved conflicts for merge of a75b0ad3 to master
Change-Id: I32a2d129c556407727ada909daa6470309d42499
Diffstat (limited to 'libs/hwui/renderthread/CanvasContext.cpp')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 940580c..5cd5f69 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -123,8 +123,8 @@ void CanvasContext::updateSurface(ANativeWindow* window) { 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 |