ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adbd: fix remount on non-system-as-root devices."

Browse source 
am: c2501fda60

Change-Id: Idc56e32bc71aa82e0a80cbb1ac537b06e89c7129
This commit is contained in:
Josh Gao 2018-09-14 17:20:56 -07:00 • committed by android-build-merger
commit 31d40d0235
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/daemon/remount_service.cpp
View file

@ -209,12 +209,8 @@ void remount_service(unique_fd fd, const std::string& cmd) {
bool system_verified = !(android::base::GetProperty("partition.system.verified", "").empty());
bool vendor_verified = !(android::base::GetProperty("partition.vendor.verified", "").empty());
std::vector<std::string> partitions{"/odm", "/oem", "/product_services", "/product", "/vendor"};
if (android::base::GetBoolProperty("ro.build.system_root_image", false)) {
partitions.push_back("/");
} else {
partitions.push_back("/system");
}
std::vector<std::string> partitions{"/", "/odm", "/oem", "/product_services",
"/product", "/vendor"};
bool verity_enabled = (system_verified || vendor_verified);