diff options
| author | John Reck <jreck@google.com> | 2015-03-24 08:34:23 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-03-24 08:34:23 -0700 |
| commit | 111928fa324db73f94389bdfab4b108cbd30d8f4 (patch) | |
| tree | 5a0d8df21948ae02fa189e8a72d9904098d55a7a | |
| parent | 1cef4196886b0cc1238111d396c1e3665a5fd2ae (diff) | |
| parent | 4142f026b30ee1ee373ea29e0d213aa5c69f9c10 (diff) | |
| download | frameworks_base-111928fa324db73f94389bdfab4b108cbd30d8f4.zip frameworks_base-111928fa324db73f94389bdfab4b108cbd30d8f4.tar.gz frameworks_base-111928fa324db73f94389bdfab4b108cbd30d8f4.tar.bz2 | |
resolved conflicts for merge of 4142f026 to master
Change-Id: Iabe3aa0ac6911a26d2ba7219f18332897276ed6f
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index ea4216c..0091790 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -418,6 +418,7 @@ CREATE_BRIDGE2(dumpGraphicsMemory, int fd, RenderThread* thread) { } void RenderProxy::dumpGraphicsMemory(int fd) { + if (!RenderThread::hasInstance()) return; SETUP_TASK(dumpGraphicsMemory); args->fd = fd; args->thread = &RenderThread::getInstance(); |