Commit graph

145 commits

Author SHA1 Message Date
The Android Open Source Project
9819bdb34e am 775a8df6: merge from open-source master
Merge commit '775a8df614d364fcb82e280069a3f533381240b4' into kraken

* commit '775a8df614d364fcb82e280069a3f533381240b4':
  adb: Add persistent system property for running adb in TCPIP mode
2010-04-21 09:15:05 -07:00
The Android Open Source Project
775a8df614 merge from open-source master
Change-Id: I686f28fcfcff1cca7cf254de9e4334cc4ea2fef7
2010-04-21 09:11:15 -07:00
Mike Lockwood
05f202a94b Merge "adb: Add persistent system property for running adb in TCPIP mode" 2010-04-20 11:09:49 -07:00
Mike Lockwood
8e2ceaeacf adb: Add persistent system property for running adb in TCPIP mode
In addition to service.adb.tcp.port, you can now set persist.adb.tcp.port
to specify the port number for adb to listen to instead of USB.
This allows the adb TCP configuration to persist across reboots.

Change-Id: I897ffcb019e8dd1785996d2f3c571cfc2f8ded38
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-20 14:06:40 -04:00
The Android Open Source Project
9110b6c8a5 am 3523412f: merge from open-source master
Merge commit '3523412f43ec616775a73f5fb8a2615370a1ee3a' into kraken

* commit '3523412f43ec616775a73f5fb8a2615370a1ee3a':
  Add -l option to `adb sync`
  vold: fix a bug of crash
2010-04-20 07:31:21 -07:00
The Android Open Source Project
3523412f43 merge from open-source master
Change-Id: Ib9250bd9d73664b07facaef362beba57a1519411
2010-04-20 07:28:23 -07:00
Anthony Newnam
705c944c0e Add -l option to adb sync
Change-Id: I87c01663dff319dde24b70560e6fe5647ebf9d49
2010-04-19 16:36:57 -07:00
The Android Open Source Project
34bff9ae7a am 8ac50107: merge from open-source master
Merge commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe' into kraken

* commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe':
  Allow 'adb pull' to pull symlinked files
2010-04-16 12:39:52 -07:00
The Android Open Source Project
8ac50107a2 merge from open-source master
Change-Id: I7f30144c12c340501f161fba70a917eb62afc41f
2010-04-16 12:36:35 -07:00
Matt Fischer
457d81cec1 Allow 'adb pull' to pull symlinked files
Change-Id: I02f31334e4ee0c7b0e7b379016629a465e711905
2010-04-15 13:36:16 -05:00
Mike Lockwood
eedc5f3525 adb: remove obsolete adb.connected system property.
This was used for adb networking, which no longer exists.
This code also failed when adb was not running as root.

Change-Id: Ied86fb1930094d5ae5009684d25e15385fd31d03
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 08:07:50 -04:00
Xavier Ducrohet
7c19bbe086 Add Pantech's USB vendor ID to adb.
Change-Id: I5334f46ee52ca1bd8067860701aef7b93296bedb
2010-03-31 13:06:47 -07:00
Takeshi Kishimoto
8d2f91db21 Added Kyocera's VID (0x0482), upon their request.
Change-Id: I8f2f2a02c22d618c0b42d4f287d88a98af3ac4fa
2010-03-12 21:34:58 +08:00
Mike Lockwood
fe582b5d32 adb: Add five second timeout for USB writes on Linux host.
This helps us recover when things go wrong during automated testing.

Change-Id: I006dbfaff7f70d51398ff12fbddcaee751453b78
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-08 22:10:52 -05:00
Brian Carlstrom
6fcc801ead Add missing newlines to adb usage message 2010-03-01 22:54:12 -08:00
Mike Lockwood
bfb0477f1d Merge "adb: do not mix printf() with write() when writing to stdout." 2010-02-27 06:16:41 -08:00
Satoshi Kataoka
1d01c295a9 Merge "Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request." 2010-02-26 01:59:39 -08:00
Mike Lockwood
dd6b36e334 adb: do not mix printf() with write() when writing to stdout.
Change-Id: I3598cc951778080bec9a21d646656d5aba57120a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-25 23:04:43 -05:00
Mike Lockwood
d969faa161 adb: Attempt to unmount the SD card before rebooting.
Change-Id: Idd4d96b4704f4e1bd324e72bca87611a23e30801
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-24 16:07:23 -05:00
The Android Open Source Project
d6391c6aaa merge from open-source master 2010-02-23 07:32:01 -08:00
Takeshi Kishimoto
01512aa3b0 Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request. 2010-02-22 19:30:41 +08:00
Mike Lockwood
0ef3fd048a adb: add -s option to adb install for installing apps on SD card.
Change-Id: Ic6b24411e594d160ddcf862cc9f1283e1e17bb4d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-19 17:53:27 -05:00
Raphael
5a912bf03e ADB: Garmin-Asus's USB Vendor ID
Change-Id: I3249d629f59d40f291079fc214b643ac6c927f76
2010-02-15 12:00:48 -05:00
Erik Gilling
2f6c2b04fb adb: add Nvidia's vendor id to adb
Signed-off-by: Erik Gilling <konkers@android.com>
2010-02-15 11:59:54 -05:00
Dan Egnor
7eced2b86a make "adb bugreport" run "bugreport" (which invokes "dumpstate"
indirectly via system service) rather than "dumpstate", that way
even when adb is not running as root, dumpstate does run as root,
and can do things like collect VM traces.
2010-02-15 11:59:47 -05:00
Mike Lockwood
429c5ae461 adb: Fix problems detecting adb in more complicated USB configurations.
Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-15 11:59:04 -05:00
Joe Onorato
8071a4bdb6 Make adb pull use . as the target file directory if you don't supply one. 2010-02-15 11:58:56 -05:00
Takeshi Kishimoto
123331adea Added USB vendor id of Sharp, based on Sharp's request.
Sharp's vendor id: 0x04dd
2010-02-09 18:10:36 +08:00
Raphael
3332d6e69d resolved conflicts for merge of 190cabb3 to master 2010-02-02 08:35:43 -08:00
Raphael
190cabb376 am 1873adc2: ADB: Garmin-Asus\'s USB Vendor ID
Merge commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7' into eclair-plus-aosp

* commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7':
  ADB: Garmin-Asus's USB Vendor ID
2010-02-01 15:34:16 -08:00
Raphael
1873adc2b1 ADB: Garmin-Asus's USB Vendor ID
Change-Id: I3249d629f59d40f291079fc214b643ac6c927f76
2010-02-01 09:56:47 -08:00
Xavier Ducrohet
f71f068fb9 Add DELL's USB Vendor ID to adb - DO NOT MERGE
Change-Id: Ie1a6b6a81f50956362aee2a2d6d1b805f0e85b7a
2010-01-21 17:24:36 -08:00
Dan Egnor
288c7cfe1b Merge "make "adb bugreport" run "bugreport" (which invokes "dumpstate" indirectly via system service) rather than "dumpstate", that way even when adb is not running as root, dumpstate does run as root, and can do things like collect VM traces." 2010-01-21 17:10:50 -08:00
Erik Gilling
6ac5e19299 adb: add Nvidia's vendor id to adb
Signed-off-by: Erik Gilling <konkers@android.com>
2010-01-20 18:19:58 -08:00
Dan Egnor
c130ea7c29 make "adb bugreport" run "bugreport" (which invokes "dumpstate"
indirectly via system service) rather than "dumpstate", that way
even when adb is not running as root, dumpstate does run as root,
and can do things like collect VM traces.
2010-01-20 13:52:59 -08:00
Mike Lockwood
37ddce736c adb: Add Dell's USB vendor ID.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 11:58:03 -05:00
Mike Lockwood
cc7a5dc770 adb: Add Dell's USB vendor ID.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 11:46:08 -05:00
Mike Lockwood
07e8f7e875 adb: Fix problems detecting adb in more complicated USB configurations.
Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-17 00:52:27 -05:00
Joe Onorato
00c0eeac6b Make adb pull use . as the target file directory if you don't supply one. 2010-01-05 13:42:25 -08:00
Mike Lockwood
a1871d2a72 adb: Add USB vendor ID for Foxconn
Change-Id: I88e4051b6e5cd820cab7e3ec417a545f50925a33
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-23 07:45:07 -05:00
Romain Guy
a48d43a077 Add adb reboot-bootloader to match fastboot reboot-bootloader.
Also fix the formatting of one of the options in the help message.
2009-12-23 07:44:50 -05:00
Mike Lockwood
a59387b508 adb: fix -d and -e options for "adb forward" command.
Change-Id: I9166572a1c398ce5ef1423d19a30895385118ee5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-23 07:44:03 -05:00
Mike Lockwood
6170404867 adb: Add USB vendor ID for Foxconn
Change-Id: I88e4051b6e5cd820cab7e3ec417a545f50925a33
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-22 09:02:21 -05:00
Romain Guy
311add489e Add adb reboot-bootloader to match fastboot reboot-bootloader.
Also fix the formatting of one of the options in the help message.
2009-12-14 14:45:17 -08:00
Mike Lockwood
255ed555d6 am 3c0c6dca: am 64e99545: adb: fix -d and -e options for "adb forward" command.
Merge commit '3c0c6dca1abc350035efedafa9ee9d705499c334'

* commit '3c0c6dca1abc350035efedafa9ee9d705499c334':
  adb: fix -d and -e options for "adb forward" command.
2009-11-28 19:34:13 -08:00
Mike Lockwood
3c0c6dca1a am 64e99545: adb: fix -d and -e options for "adb forward" command.
Merge commit '64e99545d4b5600bb5ca044fcad636ae8389b381' into eclair-mr2-plus-aosp

* commit '64e99545d4b5600bb5ca044fcad636ae8389b381':
  adb: fix -d and -e options for "adb forward" command.
2009-11-28 19:32:17 -08:00
Mike Lockwood
64e99545d4 adb: fix -d and -e options for "adb forward" command.
Change-Id: I9166572a1c398ce5ef1423d19a30895385118ee5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-28 12:46:13 -05:00
Jean-Baptiste Queru
333a80cf9f merge from eclair 2009-11-15 12:07:12 -08:00
Jean-Baptiste Queru
4b29fe640a eclair snapshot 2009-11-12 18:46:23 -08:00
Jean-Baptiste Queru
c923980e78 am ef063fe3: merge from open-source master
Merge commit 'ef063fe3066153dab5389b6baba6cb4e36888106'

* commit 'ef063fe3066153dab5389b6baba6cb4e36888106':
  Add support for Acer devices
  FreeBSD support for usb-connected devices in adb
  Make get_my_path() safer
  Fix use of memset function
2009-11-09 12:07:42 -08:00