Snap for 5206983 from d7c1801f8d to qt-release

Change-Id: I08f14af467df5dde046e1fd2b0d54d2d668145b7
This commit is contained in:
android-build-team Robot
2019-01-03 04:02:38 +00:00
2 changed files with 9 additions and 7 deletions
+2
View File
@@ -21,6 +21,8 @@ cc_defaults {
"-Werror",
],
cpp_std: "experimental",
include_dirs: [
"system/core/adb",
],
+7 -7
View File
@@ -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));
}