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

Commit afc1f0e2 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge changes Ic90fac0b,Id9c12303,I2d9bdcb1,I9d699af1,Ia4d03f9e, ... am:... 

Merge changes Ic90fac0b,Id9c12303,I2d9bdcb1,I9d699af1,Ia4d03f9e, ... am: 46f281ed am: b272ccfd am: 2758d16b
am: bfc5c122

Change-Id: I308bb3859dcee9be578365cd5007449e87e1f05b
parents 4b62d0cd bfc5c122

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int launch_server(const std::string& socket_spec); 
int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply_fd);



/* initialize a transport object's func pointers and state */

int init_socket_transport(atransport* t, int s, int port, int local);

int init_socket_transport(atransport* t, unique_fd s, int port, int local);

void init_usb_transport(atransport* t, usb_handle* usb);



std::string getEmulatorSerialString(int console_port);

adb/adb_unique_fd.h

+4 −0
Original line number Diff line number Diff line
@@ -31,3 +31,7 @@ using unique_fd = android::base::unique_fd_impl<AdbCloser>; 
#if !defined(_WIN32)

bool Pipe(unique_fd* read, unique_fd* write, int flags = 0);

#endif



template <typename T>

int adb_close(const android::base::unique_fd_impl<T>&)

        __attribute__((__unavailable__("adb_close called on unique_fd")));

adb/client/bugreport.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#include <android-base/strings.h>



#include "sysdeps.h"



#include "adb_utils.h"

#include "file_sync_service.h"

#include "client/file_sync_client.h"



static constexpr char BUGZ_BEGIN_PREFIX[] = "BEGIN:";

static constexpr char BUGZ_PROGRESS_PREFIX[] = "PROGRESS:";

adb/client/commandline.cpp

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ 
#include "adb_unique_fd.h"

#include "adb_utils.h"

#include "bugreport.h"

#include "client/file_sync_client.h"

#include "commandline.h"

#include "file_sync_service.h"

#include "services.h"

#include "shell_service.h"

#include "shell_protocol.h"

#include "sysdeps/chrono.h"

#include "sysdeps/memory.h"

adb/client/file_sync_client.cpp

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#include "client/file_sync_client.h"



#include <dirent.h>

#include <inttypes.h>

#include <limits.h>
@@ -39,7 +41,7 @@ 
#include "adb_client.h"

#include "adb_io.h"

#include "adb_utils.h"

#include "file_sync_service.h"

#include "file_sync_protocol.h"

#include "line_printer.h"

#include "sysdeps/errno.h"

#include "sysdeps/stat.h"