openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 0f832535: am a3e8a6ad: adb: Fix emulator support. 

Merge commit '0f83253596e7c23c98c141224238841a3102e5f6'

* commit '0f83253596e7c23c98c141224238841a3102e5f6':
  adb: Fix emulator support.
This commit is contained in:
Mike Lockwood 2009-08-26 12:58:34 -07:00 committed by Android Git Automerger
parent 43492e4ff4 0f83253596
commit c1f46267fa
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
adb/adb.c
View File

@ -851,7 +851,7 @@ int adb_main(int is_daemon)
HOST = 1;
usb_vendors_init();
usb_init();
local_init();
local_init(ADB_LOCAL_TRANSPORT_PORT);
if(install_listener("tcp:5037", "*smartsocket*", NULL)) {
exit(1);
@ -923,13 +923,15 @@ int adb_main(int is_daemon)
** is not set, otherwise start the network transport.
*/
property_get("service.adb.tcp.port", value, "0");
if (sscanf(value, "%d", &port) == 0) {
port = 0;
}
if (port == 0 && access("/dev/android_adb", F_OK) == 0) {
if (sscanf(value, "%d", &port) == 1 && port > 0) {
// listen on TCP port specified by service.adb.tcp.port property
local_init(port);
} else if (access("/dev/android_adb", F_OK) == 0) {
// listen on USB
usb_init();
} else {
local_init(port);
// listen on default port
local_init(ADB_LOCAL_TRANSPORT_PORT);
}
init_jdwp();
#endif

4
adb/adb.h
View File

@ -33,7 +33,7 @@
#define ADB_VERSION_MAJOR 1 // Used for help/version information
#define ADB_VERSION_MINOR 0 // Used for help/version information
#define ADB_SERVER_VERSION 24 // Increment this when we want to force users to start a new adb server
#define ADB_SERVER_VERSION 25 // Increment this when we want to force users to start a new adb server
typedef struct amessage amessage;
typedef struct apacket apacket;
@ -360,7 +360,7 @@ typedef enum {
#define ADB_PROTOCOL 0x1
void local_init();
void local_init(int port);
int local_connect(int port);
/* usb host/client interface */