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

Merge "adbd: log when exiting due to root/unroot/tcpip/usb."

Browse source 
am: de3c3e8c76

Change-Id: I12faec705e93600ad93d1ba90069805b8dd48172
This commit is contained in:
Josh Gao 2019-02-20 03:57:53 -08:00 • committed by android-build-merger
commit 2eaddf6183
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/daemon/restart_service.cpp
View file

@ -20,6 +20,7 @@
#include <unistd.h>
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <log/log_properties.h>
@ -37,6 +38,7 @@ void restart_root_service(unique_fd fd) {
return;
}
LOG(INFO) << "adbd restarting as root";
android::base::SetProperty("service.adb.root", "1");
WriteFdExactly(fd.get(), "restarting adbd as root\n");
}
@ -46,6 +48,8 @@ void restart_unroot_service(unique_fd fd) {
WriteFdExactly(fd.get(), "adbd not running as root\n");
return;
}
LOG(INFO) << "adbd restarting as nonroot";
android::base::SetProperty("service.adb.root", "0");
WriteFdExactly(fd.get(), "restarting adbd as non root\n");
}
@ -56,11 +60,13 @@ void restart_tcp_service(unique_fd fd, int port) {
return;
}
LOG(INFO) << "adbd restarting in TCP mode (port = " << port << ")";
android::base::SetProperty("service.adb.tcp.port", android::base::StringPrintf("%d", port));
WriteFdFmt(fd.get(), "restarting in TCP mode port: %d\n", port);
}
void restart_usb_service(unique_fd fd) {
LOG(INFO) << "adbd restarting in USB mode";
android::base::SetProperty("service.adb.tcp.port", "0");
WriteFdExactly(fd.get(), "restarting in USB mode\n");
}