commit f3124d8fab2377d6b5ec2c7cbc775e2ab20df3ef
author Fyodor Kupolov <fkupolov@google.com> Wed Sep 07 13:07:45 2016 -0700
committer Fyodor Kupolov <fkupolov@google.com> Wed Jan 25 12:16:06 2017 -0800
tree ba16b3f86db1f20b2ba063c58a3ad262f507faf0
parent 1bb1f85d2b6ed992efe3c7fd2ff1e47388e8d090

Remove from preloads/file_cache when clearing the cache

Test: pm trim-caches 50G internal
Bug: 31008665
Change-Id: If74f4d3c2d838ecb924aba84ad76293af34089bc

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index ede31fc..5833901 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -961,6 +961,10 @@
             add_cache_files(cache,
                     StringPrintf("%s/Android/data", create_data_media_path(uuid_, user).c_str()));
         }
+        // Add files from /data/preloads/file_cache
+        if (uuid == nullptr) {
+            add_preloads_file_cache(cache, uuid_);
+        }
         ATRACE_END();
 
         ATRACE_BEGIN("clear");