summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-03-24 15:02:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-24 15:02:10 +0000
commit4142f026b30ee1ee373ea29e0d213aa5c69f9c10 (patch)
tree89fffd7c57bae8011eafca060f84f086e63c808c
parentff4bdd0be5bd1556ecc15d28be74cd27dc9b46aa (diff)
parent05bb06fd499efcb6880359059324578b5a09e5f6 (diff)
downloadframeworks_base-4142f026b30ee1ee373ea29e0d213aa5c69f9c10.zip
frameworks_base-4142f026b30ee1ee373ea29e0d213aa5c69f9c10.tar.gz
frameworks_base-4142f026b30ee1ee373ea29e0d213aa5c69f9c10.tar.bz2
am 05bb06fd: am 540e1f8c: Merge "Don\'t create unnecessary RenderThread\'s instance when executing \'dumpsys gfxinfo\'"
* commit '05bb06fd499efcb6880359059324578b5a09e5f6': Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'
-rw-r--r--libs/hwui/renderthread/RenderProxy.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index 36ba3a9..1f61b23 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -395,6 +395,7 @@ CREATE_BRIDGE1(outputLogBuffer, int fd) {
}
void RenderProxy::outputLogBuffer(int fd) {
+ if (!RenderThread::hasInstance()) return;
SETUP_TASK(outputLogBuffer);
args->fd = fd;
staticPostAndWait(task);