tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Vold: Clean up code related to foreign dex use" am: 61a7d1a815

Browse source 
am: aaa95fbdfe

Change-Id: I71276a5d18d6c81c97b6c31086a7d9eef47fece4
This commit is contained in:
Calin Juravle 2017-03-07 19:08:15 +00:00 committed by android-build-merger
commit 0a8d4511c8
3 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ext4Crypt.cpp
View file

@ -685,7 +685,6 @@ bool e4crypt_prepare_user_storage(const char* volume_uuid, userid_t user_id, int
auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id); auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id);
auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id); auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id);
auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id); auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id);
auto foreign_de_path = android::vold::BuildDataProfilesForeignDexDePath(user_id);
// DE_n key // DE_n key
auto system_de_path = android::vold::BuildDataSystemDePath(user_id); auto system_de_path = android::vold::BuildDataSystemDePath(user_id);
@ -698,7 +697,6 @@ bool e4crypt_prepare_user_storage(const char* volume_uuid, userid_t user_id, int
multiuser_get_uid(user_id, AID_EVERYBODY))) return false; multiuser_get_uid(user_id, AID_EVERYBODY))) return false;
#endif #endif
if (!prepare_dir(profiles_de_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false; if (!prepare_dir(profiles_de_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
if (!prepare_dir(foreign_de_path, 0773, AID_SYSTEM, AID_SYSTEM)) return false;
if (!prepare_dir(system_de_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false; if (!prepare_dir(system_de_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
if (!prepare_dir(misc_de_path, 01771, AID_SYSTEM, AID_MISC)) return false; if (!prepare_dir(misc_de_path, 01771, AID_SYSTEM, AID_MISC)) return false;
@ -756,7 +754,6 @@ bool e4crypt_destroy_user_storage(const char* volume_uuid, userid_t user_id, int
auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id); auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id);
auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id); auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id);
auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id); auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id);
auto foreign_de_path = android::vold::BuildDataProfilesForeignDexDePath(user_id);
// DE_n key // DE_n key
auto system_de_path = android::vold::BuildDataSystemDePath(user_id); auto system_de_path = android::vold::BuildDataSystemDePath(user_id);
@ -769,7 +766,6 @@ bool e4crypt_destroy_user_storage(const char* volume_uuid, userid_t user_id, int
res &= destroy_dir(misc_legacy_path); res &= destroy_dir(misc_legacy_path);
#endif #endif
res &= destroy_dir(profiles_de_path); res &= destroy_dir(profiles_de_path);
res &= destroy_dir(foreign_de_path);
res &= destroy_dir(system_de_path); res &= destroy_dir(system_de_path);
res &= destroy_dir(misc_de_path); res &= destroy_dir(misc_de_path);
} }

5
Utils.cpp
View file

@ -589,11 +589,6 @@ std::string BuildDataProfilesDePath(userid_t userId) {
return StringPrintf("%s/misc/profiles/cur/%u", BuildDataPath(nullptr).c_str(), userId); return StringPrintf("%s/misc/profiles/cur/%u", BuildDataPath(nullptr).c_str(), userId);
} }
std::string BuildDataProfilesForeignDexDePath(userid_t userId) {
std::string profiles_path = BuildDataProfilesDePath(userId);
return StringPrintf("%s/foreign-dex", profiles_path.c_str());
}
std::string BuildDataPath(const char* volumeUuid) { std::string BuildDataPath(const char* volumeUuid) {
// TODO: unify with installd path generation logic // TODO: unify with installd path generation logic
if (volumeUuid == nullptr) { if (volumeUuid == nullptr) {

1
Utils.h
View file

@ -103,7 +103,6 @@ std::string BuildDataMiscLegacyPath(userid_t userid);
std::string BuildDataMiscCePath(userid_t userid); std::string BuildDataMiscCePath(userid_t userid);
std::string BuildDataMiscDePath(userid_t userid); std::string BuildDataMiscDePath(userid_t userid);
std::string BuildDataProfilesDePath(userid_t userid); std::string BuildDataProfilesDePath(userid_t userid);
std::string BuildDataProfilesForeignDexDePath(userid_t userid);
std::string BuildDataPath(const char* volumeUuid); std::string BuildDataPath(const char* volumeUuid);
std::string BuildDataMediaCePath(const char* volumeUuid, userid_t userid); std::string BuildDataMediaCePath(const char* volumeUuid, userid_t userid);