diff options
author | Tao Bao <tbao@google.com> | 2019-01-02 22:13:14 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-02 22:13:14 +0100 |
commit | 72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad (patch) | |
tree | d3d54c1b5db72cbe108c5395209b2d0a4dc576c9 /minadbd | |
parent | Merge "Add a horizontal line at the end of the graphic menu" (diff) | |
parent | minadbd: daemon_service_to_fd takes std::string_view. (diff) | |
download | android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.tar android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.tar.gz android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.tar.bz2 android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.tar.lz android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.tar.xz android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.tar.zst android_bootable_recovery-72aa58dcf7a8fcf3d853b45be3d0d9fbac985aad.zip |
Diffstat (limited to 'minadbd')
-rw-r--r-- | minadbd/Android.bp | 2 | ||||
-rw-r--r-- | minadbd/minadbd_services.cpp | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/minadbd/Android.bp b/minadbd/Android.bp index 370232b3f..a95d979a5 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -21,6 +21,8 @@ cc_defaults { "-Werror", ], + cpp_std: "experimental", + include_dirs: [ "system/core/adb", ], diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index e9c51da0a..9309ed749 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp @@ -23,6 +23,7 @@ #include <functional> #include <string> +#include <string_view> #include <thread> #include "adb.h" @@ -49,14 +50,13 @@ static void sideload_host_service(unique_fd sfd, const std::string& args) { exit(result == 0 ? 0 : 1); } -unique_fd daemon_service_to_fd(const char* name, atransport* /* transport */) { - if (!strncmp(name, "sideload:", 9)) { - // this exit status causes recovery to print a special error - // message saying to use a newer adb (that supports - // sideload-host). +unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) { + if (name.starts_with("sideload:")) { + // This exit status causes recovery to print a special error message saying to use a newer adb + // (that supports sideload-host). exit(3); - } else if (!strncmp(name, "sideload-host:", 14)) { - std::string arg(name + 14); + } else if (name.starts_with("sideload-host:")) { + std::string arg(name.substr(strlen("sideload-host:"))); return create_service_thread("sideload-host", std::bind(sideload_host_service, std::placeholders::_1, arg)); } |