commit b638bf8d3f8c5b04eaa512ead63dd0647546dbae
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 08 16:22:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 08 16:22:34 2017 +0000
tree 1292b345d5279e09007eed7fe22102077481bb73
parent 62b34b57c493990d1b779e0f5ffde138c3a4228f
parent 6ac7fb5aca33fca100bdba279847561b32c3f9ac

Merge "libbinder: use sysconf(_SC_PAGESIZE) to get pagesize"

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index f2ea0d3..29eb6e5 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -1238,7 +1238,7 @@
             calculate_tree_size(create_data_dalvik_cache_path(), &stats.codeSize,
                     sharedGid, -1);
         }
-        calculate_tree_size(create_data_misc_foreign_dex_path(userId), &stats.dataSize,
+        calculate_tree_size(create_data_user_profile_path(userId), &stats.dataSize,
                 multiuser_get_uid(userId, appId), -1);
         ATRACE_END();
     }
@@ -1336,7 +1336,7 @@
         ATRACE_BEGIN("dalvik");
         calculate_tree_size(create_data_dalvik_cache_path(), &stats.codeSize,
                 -1, -1, true);
-        calculate_tree_size(create_data_misc_foreign_dex_path(userId), &stats.dataSize,
+        calculate_tree_size(create_data_user_profile_path(userId), &stats.dataSize,
                 -1, -1, true);
         ATRACE_END();
 
@@ -1386,7 +1386,7 @@
 
         ATRACE_BEGIN("dalvik");
         calculate_tree_size(create_data_dalvik_cache_path(), &stats.codeSize);
-        calculate_tree_size(create_data_misc_foreign_dex_path(userId), &stats.dataSize);
+        calculate_tree_size(create_data_user_profile_path(userId), &stats.dataSize);
         ATRACE_END();
     }
 

cmds/installd/utils.cpp

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 1abf2b6..7c40ef7 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -235,10 +235,6 @@
     return "/data/dalvik-cache";
 }
 
-std::string create_data_misc_foreign_dex_path(userid_t userid) {
-    return StringPrintf("/data/misc/profiles/cur/%d/foreign-dex", userid);
-}
-
 // Keep profile paths in sync with ActivityThread.
 constexpr const char* PRIMARY_PROFILE_NAME = "primary.prof";
 

cmds/installd/utils.h

diff --git a/cmds/installd/utils.h b/cmds/installd/utils.h
index 6cd5aee..425b675 100644
--- a/cmds/installd/utils.h
+++ b/cmds/installd/utils.h
@@ -101,7 +101,6 @@
 std::string create_data_ref_profile_package_path(const char* package_name);
 
 std::string create_data_dalvik_cache_path();
-std::string create_data_misc_foreign_dex_path(userid_t userid);
 
 std::string create_primary_profile(const std::string& profile_dir);