summaryrefslogtreecommitdiff
path: root/libs/hwui/Caches.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2014-12-11 01:25:54 +0000
committer android-build-merger <android-build-merger@google.com> 2014-12-11 01:25:54 +0000
commitd67bb5015f716c094beff02b2c5e77c9bb7d11a0 (patch)
tree4f23359e87a1bb079bd499f922d763e45c7a8752 /libs/hwui/Caches.cpp
parent934d8d85be221b86cb5097625c0f48391b3a71b2 (diff)
parente4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7 (diff)
am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
automerge: e4a6ed9 * commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7': Don't preload textures for AssetAtlas
Diffstat (limited to 'libs/hwui/Caches.cpp')
-rw-r--r--libs/hwui/Caches.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 6453206eac3d..4bbe6edf7296 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -237,8 +237,6 @@ void Caches::terminate() {
programCache.clear();
currentProgram = NULL;
- assetAtlas.terminate();
-
patchCache.clear();
clearGarbage();