summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-04 02:43:25 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-05-04 02:43:25 +0200
commit24566cebf55380db6d063228853bd2e37742353f (patch)
tree443ebae0568e83d75d60e5b6162c03cccca6c70b
parentMerge changes from topic "cuttlefish_misc" (diff)
parentMerge "ConsumePrefix is now in libbase." (diff)
downloadandroid_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.tar
android_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.tar.gz
android_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.tar.bz2
android_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.tar.lz
android_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.tar.xz
android_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.tar.zst
android_bootable_recovery-24566cebf55380db6d063228853bd2e37742353f.zip
-rw-r--r--minadbd/minadbd_services.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 1c4c0f494..8f2b71aa1 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -230,7 +230,7 @@ static void WipeDeviceService(unique_fd fd, const std::string& args) {
unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) {
// Common services that are supported both in sideload and rescue modes.
- if (ConsumePrefix(&name, "reboot:")) {
+ if (android::base::ConsumePrefix(&name, "reboot:")) {
// "reboot:<target>", where target must be one of the following.
std::string args(name);
if (args.empty() || args == "bootloader" || args == "rescue" || args == "recovery" ||
@@ -243,17 +243,17 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport *
// Rescue-specific services.
if (rescue_mode) {
- if (ConsumePrefix(&name, "rescue-install:")) {
+ if (android::base::ConsumePrefix(&name, "rescue-install:")) {
// rescue-install:<file-size>:<block-size>
std::string args(name);
return create_service_thread(
"rescue-install", std::bind(RescueInstallHostService, std::placeholders::_1, args));
- } else if (ConsumePrefix(&name, "rescue-getprop:")) {
+ } else if (android::base::ConsumePrefix(&name, "rescue-getprop:")) {
// rescue-getprop:<prop>
std::string args(name);
return create_service_thread(
"rescue-getprop", std::bind(RescueGetpropHostService, std::placeholders::_1, args));
- } else if (ConsumePrefix(&name, "rescue-wipe:")) {
+ } else if (android::base::ConsumePrefix(&name, "rescue-wipe:")) {
// rescue-wipe:target:<message-size>
std::string args(name);
return create_service_thread("rescue-wipe",
@@ -268,7 +268,7 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport *
// This exit status causes recovery to print a special error message saying to use a newer adb
// (that supports sideload-host).
exit(kMinadbdAdbVersionError);
- } else if (ConsumePrefix(&name, "sideload-host:")) {
+ } else if (android::base::ConsumePrefix(&name, "sideload-host:")) {
// sideload-host:<file-size>:<block-size>
std::string args(name);
return create_service_thread("sideload-host",