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

Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main am: 866faf55e3 am: 6d57d3a9fa

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705735

Change-Id: Ia4b693cff865fc380f157ec6ec4cea7d672bcad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han 2023-08-12 00:15:58 +00:00 committed by Automerger Merge Worker
commit 0e013cf720
2 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Android.bp
View file

@ -239,10 +239,7 @@ cc_binary {
cc_binary {
name: "vold_prepare_subdirs",
defaults: [
"vold_default_flags",
"libapexservice-deps",
],
defaults: ["vold_default_flags"],
srcs: [
"vold_prepare_subdirs.cpp",

44
vold_prepare_subdirs.cpp
View file

@ -30,11 +30,7 @@
#include <sys/types.h>
#include <android-base/logging.h>
#include <android-base/result.h>
#include <android-base/scopeguard.h>
#include <android/apex/ApexInfo.h>
#include <android/apex/IApexService.h>
#include <binder/IServiceManager.h>
#include <cutils/fs.h>
#include <selinux/android.h>
@ -145,35 +141,27 @@ static bool rmrf_contents(const std::string& path) {
}
}
static android::base::Result<std::vector<std::string>> get_apex_list() {
auto sm = android::defaultServiceManager();
auto binder = sm->waitForService(android::String16("apexservice"));
if (binder == nullptr) {
return android::base::Error() << "Failed to get apexservice";
}
auto service = android::interface_cast<android::apex::IApexService>(binder);
std::vector<android::apex::ApexInfo> list;
auto status = service->getActivePackages(&list);
if (!status.isOk()) {
return android::base::Error() << status.exceptionMessage().c_str();
}
std::vector<std::string> names;
names.reserve(list.size());
for (const auto& apex_info : list) {
names.push_back(apex_info.moduleName);
}
return names;
}
static bool prepare_apex_subdirs(struct selabel_handle* sehandle, const std::string& path) {
if (!prepare_dir(sehandle, 0711, 0, 0, path + "/apexdata")) return false;
auto apex_list = get_apex_list();
if (!apex_list.ok()) {
LOG(ERROR) << apex_list.error();
// Since vold/vold_prepare_subdirs run in the bootstrap mount namespace
// we can't get the full list of APEXes by scanning /apex directory.
// Instead, we can look up /data/misc/apexdata for the list of APEXes,
// which is populated during `perform_apex_config` in init.
// Note: `init_user0` should be invoked after `perform_apex_config`.
auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir("/data/misc/apexdata"), closedir);
if (!dirp) {
PLOG(ERROR) << "Unable to open apex directory";
return false;
}
for (const auto& name : *apex_list) {
struct dirent* entry;
while ((entry = readdir(dirp.get())) != nullptr) {
if (entry->d_type != DT_DIR) continue;
const char* name = entry->d_name;
// skip any starting with "."
if (name[0] == '.') continue;
if (!prepare_dir(sehandle, 0771, AID_ROOT, AID_SYSTEM, path + "/apexdata/" + name)) {
return false;
}