diff options
| author | Alessandro Astone <ales.astone@gmail.com> | 2020-03-20 19:47:03 +0100 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2020-04-19 00:20:54 +0100 |
| commit | 226d851d24f3fe50482a295692c0b45d9451cd7e (patch) | |
| tree | 6205e79a8981ffca54e8209647d4071514322b04 | |
| parent | b99b9cac79604f8ce8c463366e168a2f9f80163b (diff) | |
| download | system_core-226d851d24f3fe50482a295692c0b45d9451cd7e.tar.gz system_core-226d851d24f3fe50482a295692c0b45d9451cd7e.tar.bz2 system_core-226d851d24f3fe50482a295692c0b45d9451cd7e.zip | |
adb: go back to standard adb root prop
* This reverts change Ie2b8c5e9d75371da43305f003607869370bbd1a4
plus more changes
Change-Id: Ia17239e3671d2c1a92664810ed53175110699473
| -rw-r--r-- | adb/daemon/main.cpp | 2 | ||||
| -rw-r--r-- | adb/daemon/restart_service.cpp | 4 | ||||
| -rw-r--r-- | adb/root/adbroot_service.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp index 36a28c5a5..1f2fc88c4 100644 --- a/adb/daemon/main.cpp +++ b/adb/daemon/main.cpp @@ -92,7 +92,7 @@ static bool should_drop_privileges() { bool drop = ro_secure; // ... except "adb root" lets you keep privileges in a debuggable build. - std::string prop = android::base::GetProperty("lineage.service.adb.root", ""); + std::string prop = android::base::GetProperty("service.adb.root", ""); bool adb_root = (prop == "1"); bool adb_unroot = (prop == "0"); if (ro_debuggable && adb_root) { diff --git a/adb/daemon/restart_service.cpp b/adb/daemon/restart_service.cpp index d57043628..0334cfc97 100644 --- a/adb/daemon/restart_service.cpp +++ b/adb/daemon/restart_service.cpp @@ -74,7 +74,7 @@ void restart_root_service(unique_fd fd) { #endif LOG(INFO) << "adbd restarting as root"; - android::base::SetProperty("lineage.service.adb.root", "1"); + android::base::SetProperty("service.adb.root", "1"); WriteFdExactly(fd.get(), "restarting adbd as root\n"); } @@ -85,7 +85,7 @@ void restart_unroot_service(unique_fd fd) { } LOG(INFO) << "adbd restarting as nonroot"; - android::base::SetProperty("lineage.service.adb.root", "0"); + android::base::SetProperty("service.adb.root", "0"); WriteFdExactly(fd.get(), "restarting adbd as non root\n"); } diff --git a/adb/root/adbroot_service.cpp b/adb/root/adbroot_service.cpp index df7db5dd7..b0c7ece49 100644 --- a/adb/root/adbroot_service.cpp +++ b/adb/root/adbroot_service.cpp @@ -68,7 +68,7 @@ binder::Status ADBRootService::setEnabled(bool enabled) { // Turning off adb root, restart adbd. if (!enabled) { - base::SetProperty("lineage.service.adb.root", "0"); + base::SetProperty("service.adb.root", "0"); base::SetProperty("ctl.restart", "adbd"); } } |