From e0b7f306c13faca8725ae9f81e3c125b82dace78 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Tue, 22 Dec 2020 14:49:18 +0000 Subject: [PATCH] Remove ro.vold.level_from_user. This is on everywhere, we no longer have any need for it. Fix: 171462631 Test: Presubmits Change-Id: I240361619acafeee6cac383037887e15a46c0c38 --- FsCrypt.cpp | 5 ----- binder/android/os/IVold.aidl | 1 - vold_prepare_subdirs.cpp | 11 +++-------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/FsCrypt.cpp b/FsCrypt.cpp index 8f6ba9c..988d2a7 100644 --- a/FsCrypt.cpp +++ b/FsCrypt.cpp @@ -794,11 +794,6 @@ bool fscrypt_lock_user_key(userid_t user_id) { static bool prepare_subdirs(const std::string& action, const std::string& volume_uuid, userid_t user_id, int flags) { - // TODO(b/141677108): Remove this & make it the default behavior - if (android::base::GetProperty("ro.vold.level_from_user", "1") == "1") { - flags |= android::os::IVold::STORAGE_FLAG_LEVEL_FROM_USER; - } - if (0 != android::vold::ForkExecvp( std::vector{prepare_subdirs_path, action, volume_uuid, std::to_string(user_id), std::to_string(flags)})) { diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl index ef4f89a..28e343f 100644 --- a/binder/android/os/IVold.aidl +++ b/binder/android/os/IVold.aidl @@ -168,7 +168,6 @@ interface IVold { const int STORAGE_FLAG_DE = 1; const int STORAGE_FLAG_CE = 2; - const int STORAGE_FLAG_LEVEL_FROM_USER = 4; const int REMOUNT_MODE_NONE = 0; const int REMOUNT_MODE_DEFAULT = 1; diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp index 0283614..e2afb81 100644 --- a/vold_prepare_subdirs.cpp +++ b/vold_prepare_subdirs.cpp @@ -166,13 +166,9 @@ static bool prepare_apex_subdirs(struct selabel_handle* sehandle, const std::str static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int flags) { struct selabel_handle* sehandle = selinux_android_file_context_handle(); - const uid_t user_for_level = - (flags & android::os::IVold::STORAGE_FLAG_LEVEL_FROM_USER) ? user_id : -1; - if (flags & android::os::IVold::STORAGE_FLAG_DE) { auto user_de_path = android::vold::BuildDataUserDePath(volume_uuid, user_id); - if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM, user_de_path, - user_for_level)) { + if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM, user_de_path, user_id)) { return false; } @@ -187,7 +183,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id); if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM, profiles_de_path, - user_for_level)) { + user_id)) { return false; } @@ -203,8 +199,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla } if (flags & android::os::IVold::STORAGE_FLAG_CE) { auto user_ce_path = android::vold::BuildDataUserCePath(volume_uuid, user_id); - if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM, user_ce_path, - user_for_level)) { + if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM, user_ce_path, user_id)) { return false; }