commit 6104cea3fb0bddd766f390f9f4e2db9fc00b410e
author John Reck <jreck@google.com> Thu Jan 10 14:37:17 2019 -0800
committer John Reck <jreck@google.com> Thu Jan 10 15:34:49 2019 -0800
tree 3493ab6e3dc09dd9ffd027bc1fa85cc84abb2635
parent 8b9351ba04eef507d4ff97a84d0c13df60507daf

Fix leak/crash in exit

Bug: 120440607
Test: hwuimacro32 doesn't crash
Change-Id: I35b7a924e338efb314f07b923ba22ffcf98f75ee

libs/hwui/tests/macrobench/main.cpp

diff --git a/libs/hwui/tests/macrobench/main.cpp b/libs/hwui/tests/macrobench/main.cpp
index 524dfb0..174a140 100644
--- a/libs/hwui/tests/macrobench/main.cpp
+++ b/libs/hwui/tests/macrobench/main.cpp
@@ -19,6 +19,8 @@
 
 #include "Properties.h"
 #include "hwui/Typeface.h"
+#include "HardwareBitmapUploader.h"
+#include "renderthread/RenderProxy.h"
 
 #include <benchmark/benchmark.h>
 #include <getopt.h>
@@ -353,6 +355,9 @@
         gBenchmarkReporter->Finalize();
     }
 
+    renderthread::RenderProxy::trimMemory(100);
+    HardwareBitmapUploader::terminate();
+
     LeakChecker::checkForLeaks();
     return 0;
 }