PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ConsumePrefix is now in libbase."

Browse Source 
am: b699b4b1cd

Change-Id: I03b337a921882fa0c06744fb903b8e06c385f9d9
This commit is contained in:
Elliott Hughes
2019-05-03 17:43:25 -07:00
committed by android-build-merger
parent d3916e2f1f b699b4b1cd
commit 24566cebf5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minadbd/minadbd_services.cpp
+5 -5
View File
@@ -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 */) { unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) {
// Common services that are supported both in sideload and rescue modes. // 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. // "reboot:<target>", where target must be one of the following.
std::string args(name); std::string args(name);
if (args.empty() || args == "bootloader" || args == "rescue" || args == "recovery" || 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. // Rescue-specific services.
if (rescue_mode) { if (rescue_mode) {
if (ConsumePrefix(&name, "rescue-install:")) { if (android::base::ConsumePrefix(&name, "rescue-install:")) {
// rescue-install:<file-size>:<block-size> // rescue-install:<file-size>:<block-size>
std::string args(name); std::string args(name);
return create_service_thread( return create_service_thread(
"rescue-install", std::bind(RescueInstallHostService, std::placeholders::_1, args)); "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> // rescue-getprop:<prop>
std::string args(name); std::string args(name);
return create_service_thread( return create_service_thread(
"rescue-getprop", std::bind(RescueGetpropHostService, std::placeholders::_1, args)); "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> // rescue-wipe:target:<message-size>
std::string args(name); std::string args(name);
return create_service_thread("rescue-wipe", 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 // This exit status causes recovery to print a special error message saying to use a newer adb
// (that supports sideload-host). // (that supports sideload-host).
exit(kMinadbdAdbVersionError); exit(kMinadbdAdbVersionError);
} else if (ConsumePrefix(&name, "sideload-host:")) { } else if (android::base::ConsumePrefix(&name, "sideload-host:")) {
// sideload-host:<file-size>:<block-size> // sideload-host:<file-size>:<block-size>
std::string args(name); std::string args(name);
return create_service_thread("sideload-host", return create_service_thread("sideload-host",