commit 4848961f1bdd2c4d2809e45a44a40045d086c361
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 14 23:24:44 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 14 23:24:44 2018 +0000
tree 8eaf9ec5aa3ad3e47beceac60d1bb4c53749cd23
parent 948bb498a31f3d06b32fd6c9d050459be379a0dd
parent 9f4a67f8d387a6802997be63217d5fa73db50160

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

adb/daemon/remount_service.cpp

diff --git a/adb/daemon/remount_service.cpp b/adb/daemon/remount_service.cpp
index 76500d4..cf4d294 100644
--- a/adb/daemon/remount_service.cpp
+++ b/adb/daemon/remount_service.cpp
@@ -209,12 +209,8 @@
     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);