Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29578b11 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "minadbd: daemon_service_to_fd takes std::string_view." 

am: 72aa58dc

Change-Id: I9a7d20d476e0be703657e7c332f393703a982b1a
parents 095b6858 72aa58dc

minadbd/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ cc_defaults { 
        "-Werror",

    ],



    cpp_std: "experimental",



    include_dirs: [

        "system/core/adb",

    ],

minadbd/minadbd_services.cpp

+7 −7
Original line number Diff line number Diff line
@@ -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));

  }