commit cd3a22cfec09c065d0667dd044c0788912e82465
author John Reck <jreck@google.com> Wed Aug 06 13:33:59 2014 -0700
committer John Reck <jreck@google.com> Wed Aug 06 20:39:47 2014 +0000
tree 37f6d66362a53a9e863a51e8d56007a39ae7c15b
parent b287c9388e6d978d88854376d7f29fee3708276c

Don't start RenderThread to do trimMemory

 Bug: 16825138

Change-Id: I35f57898b14bc8526c3d93a3003bca6f5a3d7fbe

libs/hwui/renderthread/RenderProxy.cpp

diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index 3f03093..986e808 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -336,11 +336,14 @@
 }
 
 void RenderProxy::trimMemory(int level) {
-    RenderThread& thread = RenderThread::getInstance();
-    SETUP_TASK(timMemory);
-    args->thread = &thread;
-    args->level = level;
-    thread.queue(task);
+    // Avoid creating a RenderThread to do a trimMemory.
+    if (RenderThread::hasInstance()) {
+        RenderThread& thread = RenderThread::getInstance();
+        SETUP_TASK(timMemory);
+        args->thread = &thread;
+        args->level = level;
+        thread.queue(task);
+    }
 }
 
 CREATE_BRIDGE0(fence) {