Commit Graph

2216 Commits

Author SHA1 Message Date
Mike Lockwood ecfb75d9e4 adb: Fix infinite loop in Linux host device discovery.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Mike Lockwood 668cc77101 adb: print better error message when there are insufficient permissions for a device.
Now, a command like "adb shell" will print "insufficient permissions for device"
instead of "device not found" if adb does not have permissions to communicate with the device.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Mike Lockwood a8be72f653 adb: update call to register_usb_transport in Mac and Windows builds.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Mike Lockwood 95b837d38b adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.
adb devices will now list devices without adequate file system permissions in /dev/bus/usb as:

List of devices attached
????????????	no permissions

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Guang Zhu e64004d327 adb: Use correct language ID when retrieving USB serial number.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Mike Lockwood 63e6152748 adb: Remove adbd from simulator build.
It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Mike Lockwood 5f4b051235 adb: add "adb reboot" command.
This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 14:46:18 -07:00
Mathias Agopian 3969080e23 get rid of utils/executablepath.h, which now lives in the simulator 2009-08-26 14:46:18 -07:00
Nick Pelly 22048ef325 Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
Overridden by -s.
2009-08-26 14:46:18 -07:00
Mike Lockwood a3e8a6ad56 adb: Fix emulator support.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 12:50:22 -07:00
Xavier Ducrohet 1bba53f7c8 Fix broken 'adb root' command.
Change-Id: I75bf01863e82967a7214d3e31b8db792690716c1
2009-08-25 20:16:14 -07:00
Mike Lockwood ff19670d48 adb: Improved support for running adb over TCP/IP
Added new commands:

adb connect <host>:<port> (to connect to a device via TCP/IP)
adb tcpip <port>          (to restart adbd on the device to listen on TCP/IP)
adb usb                   (to restart adbd on the device to listen USB)

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-24 16:05:58 -07:00
Raphael 818806ad59 am e3baafd8: BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
Merge commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e'

* commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e':
  BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
2009-08-12 12:04:07 -07:00
Raphael e3baafd85a BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK 2009-08-11 11:08:45 -07:00
Mike Lockwood d70dc73d8d adb: Fix infinite loop in Linux host device discovery.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-11 11:29:40 -04:00
Mike Lockwood c52c602171 DO NOT MERGE adb: Remove adbd from simulator build.
It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-10 21:48:22 -04:00
Mike Lockwood 704aa83338 DO NOT MERGE cherry-pick "adb reboot" from master:
adb: add "adb reboot" command.

This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-10 20:15:25 -04:00
Mike Lockwood 37d3111b1c adb: print better error message when there are insufficient permissions for a device.
Now, a command like "adb shell" will print "insufficient permissions for device"
instead of "device not found" if adb does not have permissions to communicate with the device.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-08 13:53:16 -04:00
Mike Lockwood 5c93dba771 adb: update call to register_usb_transport in Mac and Windows builds.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-08 13:16:54 -04:00
Mike Lockwood 0927bf9690 adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.
adb devices will now list devices without adequate file system permissions in /dev/bus/usb as:

List of devices attached
????????????	no permissions

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-08 12:44:35 -04:00
Guang Zhu 1a1f818986 adb: Use correct language ID when retrieving USB serial number.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-07 06:36:42 -04:00
Mike Lockwood 781d041892 adb: Remove adbd from simulator build.
It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-06 10:58:00 -04:00
Mike Lockwood ee15662140 adb: add "adb reboot" command.
This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-05 17:57:20 -04:00
Mike Lockwood 1f4ff53517 am cc1de48d: adb: Another attempted workaround for the adb disconnect problem.
Merge commit 'cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad'

* commit 'cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad':
  adb: Another attempted workaround for the adb disconnect problem.
2009-07-30 16:31:40 -07:00
Mike Lockwood cc1de48dcd adb: Another attempted workaround for the adb disconnect problem.
For adb shell commands (as well as shell based commands like logcat and bugreport) we now
batch USB writes into 4K chunks instead of sending small packets of data as they come in.
A timeout prevents us from blocking for more than 100ms when our 4K buffer is partially full.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-30 16:23:56 -07:00
Xavier Ducrohet 1fde31c8fb am de6f62a6: Add support for Samsung and Motorola devices.
Merge commit 'de6f62a609120c3d9e4e53689c3b309842ec874b'

* commit 'de6f62a609120c3d9e4e53689c3b309842ec874b':
  Add support for Samsung and Motorola devices.
2009-07-24 16:09:22 -07:00
Xavier Ducrohet de6f62a609 Add support for Samsung and Motorola devices.
Also update the linux code. Some devices have more complex USB descriptors
which can't be parsed with the simple assumption of just skipping the
endpoint descriptors.
2009-07-24 14:42:27 -07:00
Mike Lockwood dd8a23b774 am 7bf68842: adb: Increment ADB_SERVER_VERSION
Merge commit '7bf68842d765ad7e6a51426b625d0de6d2331740'

* commit '7bf68842d765ad7e6a51426b625d0de6d2331740':
  adb: Increment ADB_SERVER_VERSION
2009-07-09 17:12:06 -07:00
Mike Lockwood 7bf68842d7 adb: Increment ADB_SERVER_VERSION
It was pointed out that we should have done this when we added the "adb root" command.
And doing this will also force people to pick up the recent Linux USB serial number fix.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-09 20:09:10 -04:00
Kenny Root df3fb65e98 am c989199c: Fix typo in adb commandline help
Merge commit 'c989199ccfbe745a7109f57d2aee2577d2f72b8d'

* commit 'c989199ccfbe745a7109f57d2aee2577d2f72b8d':
  Fix typo in adb commandline help
2009-07-08 09:07:49 -07:00
Kenny Root c989199ccf Fix typo in adb commandline help
Android developers are not expected to have PDP-11s.
2009-07-08 12:05:05 -04:00
Mike Lockwood 5089bd0a6e am 3d9b265b: adb: Use correct language ID when retrieving USB serial number.
Merge commit '3d9b265b7d34d886a2f44e486c25e402d7df791b'

* commit '3d9b265b7d34d886a2f44e486c25e402d7df791b':
  adb: Use correct language ID when retrieving USB serial number.
2009-07-08 07:30:39 -07:00
Mike Lockwood 3d9b265b7d adb: Use correct language ID when retrieving USB serial number.
Fixes http://code.google.com/p/android/issues/detail?id=2609

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-08 10:28:38 -04:00
Android (Google) Code Review 7490e4b170 am 34c34267: Merge change 3951 into donut
Merge commit '34c342677e4ffb57584d571d8996822bf4d879ef'

* commit '34c342677e4ffb57584d571d8996822bf4d879ef':
  Revert "adb: Workaround for adb disconnect problem."
2009-06-12 04:59:42 -07:00
Mike Lockwood 02d40b51c6 Revert "adb: Workaround for adb disconnect problem."
This reverts commit e38a31e305.

This change had the unfortunate side effect of breaking ctrl-C
when executing "adb shell <command>"

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-11 17:40:48 -04:00
Android (Google) Code Review f4c94943a9 am 87657782: Merge change 3008 into donut
Merge commit '876577823d7679fa18f175405ce77e5257161e3a'

* commit '876577823d7679fa18f175405ce77e5257161e3a':
  adb: Workaround for adb disconnect problem.
2009-06-02 22:48:18 -07:00
Mike Lockwood e38a31e305 adb: Workaround for adb disconnect problem.
For non-interactive adb shell commands, batch USB writes into 4K chunks
instead of sending small packets of data as they come in.
Add a timeout so we do not block for more than 200ms when our 4K buffer is partially full.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-02 22:09:03 -07:00
Mathias Agopian 89ac364c54 get rid of utils/executablepath.h, which now lives in the simulator 2009-05-31 18:50:09 -07:00
Mike Lockwood 5b043d6182 am 1f546e6d: adb: Allow enabling of device side adbd logging with a persistent system property.
Merge commit '1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945'

* commit '1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945':
  adb: Allow enabling of device side adbd logging with a persistent system property.
2009-05-25 15:32:19 -07:00
Mike Lockwood 1f546e6d1f adb: Allow enabling of device side adbd logging with a persistent system property.
To enable logging, set the property persist.adb.trace_mask to a hex value
containing the bitmask for adb_trace_mask (see the TRACE_* enum values in adb.h).
This will result in adb writing log output to a file in /data/adb/
No logging will occur if persist.adb.trace_mask is not set or has a value
that cannot be parsed as a hex integer.
The property is read once only at startup, so you must reboot or restart adbd
for changes in the property to take effect.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-25 18:17:55 -04:00
Mike Lockwood 64c6397b56 am 6a3075c7: adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
Merge commit '6a3075c78287ea5a7ee7a3c85cde58e894350822'

* commit '6a3075c78287ea5a7ee7a3c85cde58e894350822':
  adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
2009-05-25 11:32:08 -07:00
Mike Lockwood 6a3075c782 adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-25 14:22:58 -04:00
Android (Google) Code Review fc8e241871 am 0469d2c3: Merge change 2282 into donut
Merge commit '0469d2c37adddcb30cb0d88772bef33ac26c6500'

* commit '0469d2c37adddcb30cb0d88772bef33ac26c6500':
  Support for 3rd party USB Vendor IDs in adb.
2009-05-22 15:30:14 -07:00
Xavier Ducrohet a481d096fe Support for 3rd party USB Vendor IDs in adb.
Vendor IDs are read from ~/.android/adb_usb.ini. The format is very simple:
1 number per line. First number is ID count, followed by the ID themselves.
Lines starting with # are considered comments.

Other misc changes: moved VENDOR_ID_* to usb_vendors.c to prevent direct
access. Made transport_usb.c reuse the USB constant introduced in usb_osx
(moved them to adb.h)
2009-05-22 15:25:25 -07:00
Xavier Ducrohet 8a88939d64 am a09fbd16: Preparation work for adb to support USB vendor Ids provided by SDK add-ons.
Merge commit 'a09fbd164d2e088bc5433d310e25640ae048d47d'

* commit 'a09fbd164d2e088bc5433d310e25640ae048d47d':
  Preparation work for adb to support USB vendor Ids provided by SDK add-ons.
2009-05-21 11:55:52 -07:00
Xavier Ducrohet a09fbd164d Preparation work for adb to support USB vendor Ids provided by SDK add-ons.
Added usb_vendors.* which handles creating (and deleting) a list of vendor ids.
This list is meant to be used everywhere the built-in lists (usb_osx), or the
built-in vendor IDs (transport_usb)  were used.

For now the list is only built with the built-in VENDOR_ID_*. Next step
is to read a small file created from all the SDK add-on.

Other misc changes: made is_adb_interface present only if ADB_HOST is true
to prevent accessing a list that doesn't exist (usb_vendors is only
compiled for the host version of adb).
2009-05-21 10:18:43 -07:00
Android (Google) Code Review df849ca5f8 am a61755e5: Merge change 2077 into donut
Merge commit 'a61755e5fca065dfc89c7639bb672c20a4f9854e'

* commit 'a61755e5fca065dfc89c7639bb672c20a4f9854e':
  move native_handle stuff from master_gl
  adb: adbd no longer disables OOM and now sets children's OOM adjustment to zero
2009-05-20 17:35:56 -07:00
Mike Lockwood 249ad57a88 adb: adbd no longer disables OOM and now sets children's OOM adjustment to zero
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-20 09:14:30 -04:00
Android (Google) Code Review 342520f2ed am 1b154930: Merge change 1867 into donut
Merge commit '1b154930b2c2634dce9c04d5d5cec7acb229ccb0'

* commit '1b154930b2c2634dce9c04d5d5cec7acb229ccb0':
  Cleaning up whitespace in adb sources. Nothing more, nothing less.
2009-05-19 02:53:38 -07:00
David 'Digit' Turner 34c22c5ba9 am 414ff7d9: Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
Merge commit '414ff7d98ac8d7610a26206335954ad15f43f3ac'

* commit '414ff7d98ac8d7610a26206335954ad15f43f3ac':
  Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
2009-05-18 08:37:02 -07:00
David 'Digit' Turner f6330a2eeb Cleaning up whitespace in adb sources. Nothing more, nothing less. 2009-05-18 17:36:28 +02:00
David 'Digit' Turner 414ff7d98a Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon. 2009-05-18 17:07:46 +02:00
Dima Zavin 16b5d6e75c am 3fd82b8: adb: osx: Match devices based on interface subclass and prot
Merge commit '3fd82b8861aa410fab7785074941b459d92220c1'

* commit '3fd82b8861aa410fab7785074941b459d92220c1':
  adb: osx: Match devices based on interface subclass and protocol
2009-05-10 12:56:40 -07:00
Dima Zavin 3fd82b8861 adb: osx: Match devices based on interface subclass and protocol
Enumerating all vendor+product id combinations is not practical.
This modifies the matching algorithm to use the adb interface
subclass/protocol instead (0x42/0x1).

Signed-off-by: Dima Zavin <dima@android.com>
2009-05-09 12:49:54 -07:00
Android (Google) Code Review 46f208e40d Merge change 1171
* changes:
  Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
2009-05-08 09:07:09 -07:00
Nick Pelly db44926403 Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
Overridden by -s.
2009-05-07 12:48:03 -07:00
Marco Nelissen b9e966f56b adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
2009-05-01 08:15:55 -07:00
The Android Open Source Project e037fd7e19 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:37 -07:00
The Android Open Source Project 2015549667 auto import from //branches/cupcake/...@137873 2009-03-11 12:12:01 -07:00
The Android Open Source Project dd7bc3319d auto import from //depot/cupcake/@135843 2009-03-03 19:32:55 -08:00
The Android Open Source Project e54eebbf1a auto import from //depot/cupcake/@135843 2009-03-03 18:29:04 -08:00
The Android Open Source Project 1b8e5a6b14 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:54 -08:00
The Android Open Source Project 13f797da7f auto import from //branches/cupcake/...@130745 2009-02-10 15:44:07 -08:00
The Android Open Source Project 5ae090ed94 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:25 -08:00
The Android Open Source Project 35237d1358 Code drop from //branches/cupcake/...@124589 2008-12-17 18:08:08 -08:00
The Android Open Source Project 4f6e8d7a00 Initial Contribution 2008-10-21 07:00:00 -07:00