Commit graph

715 commits

Author SHA1 Message Date
Esteban de la Canal
da5b2d67fa am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
* commit '99bb69c1cee678382bf5e48962aa444469b3310e':
  74602: Fixes adb not seeing connected devices on Mac.
2014-09-12 21:43:43 +00:00
Esteban de la Canal
f41ee3d5a1 Merge "74602: Fixes adb not seeing connected devices on Mac." 2014-09-12 21:11:14 +00:00
Esteban de la Canal
9dd83dc96e 74602: Fixes adb not seeing connected devices on Mac.
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html

Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-11 11:36:50 -07:00
Elliott Hughes
8fa75e44f1 am 6608a46c: am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
* commit '6608a46c59abd72bd42a5104937fb276b6b0ccbd':
  adb: Add USB vendor ID for Alco Digital Devices Limited
2014-09-10 18:26:35 +00:00
DanielMo
553630e423 adb: Add USB vendor ID for Alco Digital Devices Limited
Change-Id: I50d343d583e688e9f8a72d1c61618b384e310fe1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-09-10 13:58:32 +08:00
Jeff Sharkey
84e533d7b0 am 228f8261: Merge "delete_file() should force removal." into lmp-dev
* commit '228f8261fd778e1c03184b5f79f979d1a25abf50':
  delete_file() should force removal.
2014-09-09 21:56:14 +00:00
Jeff Sharkey
41b3cfa296 delete_file() should force removal.
It's a shell command with a pty, but it's not really interactive,
so force the removal to avoid giving users dead-end prompts.

Bug: 17339227
Change-Id: Iaf5d95c49f032066aa741a711a2c45557d93c598
2014-09-09 12:38:30 -07:00
Christopher Ferris
fb849bd46e am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."
* commit 'fc8e16bfc59fcebaf554e266aae808eed5f2d078':
  Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:25:48 +00:00
Christopher Ferris
2c80588340 Merge "Add -Wno-deprecated-declarations to makefiles." 2014-09-06 16:56:46 +00:00
Chih-Hung Hsieh
6d94763b2f am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."
* commit '379ca94d00cab91a77ad8991cc92e2b4d4236d56':
  Include ADB_HOST only code in #if ADB_HOST.
2014-09-05 23:58:09 +00:00
Chih-Hung Hsieh
299a32c803 Merge "Include ADB_HOST only code in #if ADB_HOST." 2014-09-05 23:38:07 +00:00
Chih-Hung Hsieh
f787b381b6 Include ADB_HOST only code in #if ADB_HOST.
BUG: 17409892
Change-Id: Ic1199dd745191aba718fdb18343e87c0ccbe530b
2014-09-05 16:34:02 -07:00
Elliott Hughes
709569febf am 0dcc3f65: am 9c814648: Merge "Add USB Vendor ID for Micromax Informatics Ltd."
* commit '0dcc3f65b1ff5fa771618436ee4bfdd44cd2f672':
  Add USB Vendor ID for Micromax Informatics Ltd.
2014-09-05 23:31:15 +00:00
Abhishek Karmakar
4d10523be8 Add USB Vendor ID for Micromax Informatics Ltd.
Signed-off-by: Abhishek Karmakar <abhishek.karmakar@micromaxinfo.com>
Change-Id: I63462eb15575cc953ac0246ee5d4c883d3678c08
2014-09-05 16:06:25 -07:00
Christopher Ferris
51448eb39e Add -Wno-deprecated-declarations to makefiles.
This is in preparation for an update to the uapi v3.16.1
kernel headers that marks the structure usb_functionfs_descs_head
as deprecated.

Change-Id: I25d2f32ce8e95e038e6df201ce2f8126f5a8b6fa
2014-09-04 16:13:42 -07:00
Ying Wang
0c3d98b02b am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build."
* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
  Fix 64-bit host build.
2014-08-14 23:20:06 +00:00
Ying Wang
42a809ba06 Fix 64-bit host build.
Bug: 13751317
Change-Id: Ibf62935b7d12a55ffc57242a26a2581b52796847
2014-08-14 15:52:54 -07:00
Elliott Hughes
e772705a59 am 771f6f29: am 29c5a78f: Merge "Fix build of adb with gcc-4.9."
* commit '771f6f299f16704b251d6adb8fb185c8fb517d07':
  Fix build of adb with gcc-4.9.
2014-08-06 18:06:33 +00:00
Alexander Ivchenko
678bd2e822 Fix build of adb with gcc-4.9.
Without this patch we get:

system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]

Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>

(cherry picked from commit 5372333885)

Change-Id: I920c1de933ce5ba0a0d57eb8a9b557325a767a2a
2014-08-06 10:59:53 -07:00
Brian Carlstrom
8a01917da1 am 46a8ffe8: Fix Windows adb build by avoiding "bool"
* commit '46a8ffe87f3cba070fb18a90e3c5c1f73468f99c':
  Fix Windows adb build by avoiding "bool"
2014-08-06 12:57:22 +00:00
Brian Carlstrom
46a8ffe87f Fix Windows adb build by avoiding "bool"
Change-Id: I9ca59e400c199d497a1a18d5e64c2cafe628097b
2014-08-05 22:51:18 -07:00
Jeff Sharkey
8c9b155ea1 am 43d65b69: Merge "Escape single quotes in arguments." into lmp-dev
* commit '43d65b6903249a409031b081bb6175b9ad3e5c2a':
  Escape single quotes in arguments.
2014-08-06 01:23:28 +00:00
Elliott Hughes
440df7b61f am 830a8641: am a8d0c4a2: Merge "Move host \'get-state\' service up so that it works."
* commit '830a8641bb960d208ad2a5b3bc3d9fb91bc31c2b':
  Move host 'get-state' service up so that it works.
2014-08-06 01:22:09 +00:00
Elliott Hughes
29c5a78fdc Merge "Fix build of adb with gcc-4.9." 2014-08-05 00:30:25 +00:00
Alexander Ivchenko
5372333885 Fix build of adb with gcc-4.9.
Without this patch we get:

system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]

Change-Id: I494eb8b4d0e8082f8ff57bdd33d8d46c8c481c6f
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-08-06 16:07:17 +04:00
Elliott Hughes
a8d0c4a2b8 Merge "Move host 'get-state' service up so that it works." 2014-08-05 00:30:25 +00:00
Jeff Sharkey
0cc642c82d Partially revert argument escaping.
Commands chained with && need to be passed through literally instead
of always being quoted.

(cherry-pick of 7c460351f53cb683097fe4071b9ec1e4cd7cdf82.)

Bug: 15479704
Change-Id: I2998e40a92a3bfd092098cd526403b469c86c9a6
2014-08-05 22:55:39 +00:00
Jeff Sharkey
dcd2f0ef2f Uniformly escape shell arguments.
Arguments with embedded spaces need to be wrapped in quotes, which
changes the overall escaping strategy.  Instead of mixing the two
strategies, just always wrap arguments in quotes.

(cherry-pick of fd546e8c35341b518873eb4f883afbed92e947af.)

Bug: 15479704
Change-Id: I03eacfa1bd6c220d4ec6617b825ebb0c43c7221e
2014-08-05 22:54:35 +00:00
Jeff Sharkey
43d65b6903 Merge "Escape single quotes in arguments." into lmp-dev 2014-08-05 00:19:02 +00:00
Simon Ye
d9c4b14b44 Move host 'get-state' service up so that it works.
Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

(cherry picked from commit dc22c3c7a8)

Change-Id: I08465e7c666104a4c2d15eadef8a4d4be7f91456
2014-08-05 17:23:35 -07:00
Jeff Sharkey
d0eee747f6 Escape single quotes in arguments.
Verified that these use-cases continue working:

$ adb shell arg a a 'b b'
$ adb shell arg a a "b b"
|arg|a|a|b b|

$ adb shell arg "a a 'b b'"
|arg|a a 'b b'|

$ adb shell arg 'a a "b b"'
|arg|a a "b b"|

$ adb shell arg a\"b\'c
|arg|a"b'c|

$ adb shell "arg a && arg b"
|arg|a|
|arg|b|

$ adb shell "arg 'a' \"b\" c"
|arg|a|b|c|

Bug: 16139781
Change-Id: I3b010b6cdf57281695c11fda318c9bea0a7221cc
2014-08-05 16:53:25 -07:00
leozwang
05004026d9 am a361503e: Merge "Consolidate adb trace macro defines into its own header file." into lmp-dev
* commit 'a361503e3e68d1b26ce737547c4e1d53a03ec2d9':
  Consolidate adb trace macro defines into its own header file.
2014-07-30 16:44:52 +00:00
Elliott Hughes
43eb2ea5f8 am ec531e5c: am 47a12389: Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break."
* commit 'ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4':
  Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
2014-07-29 18:42:53 +00:00
Simon Ye
dc22c3c7a8 Move host 'get-state' service up so that it works.
Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

Change-Id: Id4b72a051ff04104659925e63a02eb340db2f807
2014-07-28 11:44:46 -07:00
Elliott Hughes
d235288553 Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
Change-Id: I633dc4d6d421862473e7267cc0d2c1b0933392e0
2014-07-29 11:32:16 -07:00
leozwang
a361503e3e Merge "Consolidate adb trace macro defines into its own header file." into lmp-dev 2014-07-25 21:16:23 +00:00
leozwang
d3fc15f484 Consolidate adb trace macro defines into its own header file.
Most code is copied and pasted from adb.h.
Any file can just include it to enable tracing.
Removed some duplications.

Change-Id: Ie1ed9e9edbf92158aac84669fbcbf7dc85fe2cf0
2014-07-29 14:07:46 -07:00
Elliott Hughes
a6ff5c95a3 Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
(cherry picked from commit d235288553)

Change-Id: I05f8160bc8c356cb8a57e2bc5677517750700456
2014-07-29 11:34:14 -07:00
Jeff Sharkey
555a904f7c am 74ff4fcf: Merge "Follow refactoring of install-abandon command." into lmp-dev
* commit '74ff4fcfc46e853ecd9fe34b5cedb47fc379f1af':
  Follow refactoring of install-abandon command.
2014-07-25 19:19:33 +00:00
leozwang
75619aabb3 am 5a255238: Merge "Redirect debug output to logcat." into lmp-dev
* commit '5a2552388e698fec4efda270d2d88bb18ed3f299':
  Redirect debug output to logcat.
2014-07-25 16:45:39 +00:00
Colin Cross
6cc961c7cb am edf41f98: am 8d9d362b: Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC."
* commit 'edf41f981c47d857bd130e8ecc95cd7cf0a0fe0a':
  adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
2014-07-25 03:39:11 +00:00
Tim Murray
2cc4fd73d1 am 6ebaf311: am 721f189a: Merge "fix adb build on Darwin"
* commit '6ebaf311a7af8d20979deba279f9d5096ed8f193':
  fix adb build on Darwin
2014-07-25 02:24:29 +00:00
DanielMo
43222b3f0a adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
Change-Id: Id66997709fec55b1efd389abf2efa644b9a8ccf4
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-07-25 11:17:55 +08:00
leozwang
5a2552388e Merge "Redirect debug output to logcat." into lmp-dev 2014-07-24 22:43:15 +00:00
Tim Murray
1efcdeffe5 fix adb build on Darwin
bug 16172793

Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
2014-07-24 18:33:12 -07:00
Jeff Sharkey
ac77e1f4e4 Follow refactoring of install-abandon command.
Bug: 16543552
Change-Id: I1f54254813fd7d7f4341b8815f816535a39de079
2014-07-25 10:09:18 -07:00
leozwang
48a904240b Redirect debug output to logcat.
If ADB_TRACE is enabled, debug output will be redirected to logcat.

Change-Id: I9c36ada7690a2b946ecd6a926d04e36a8313c36a
2014-07-23 22:45:02 -07:00
Nick Kralevich
9866a66d6d adb: set O_CLOEXEC on lots of file descriptors
Too many leaking FDs.

Fixes bug: https://code.google.com/p/android/issues/detail?id=65857
(and more)

(cherrypicked from commit fe8d7f4f2e)

Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e
2014-07-21 19:34:31 -07:00
Greg Hackmann
7046773595 adb: replace utimes() with utime()
Fix the win_sdk host build by replacing utimes() with utime().  utime()
is functionally equivalent to utimes() when dealing with non-fractional
second timestamps, and is supported by the Windows CRT.

(The Windows CRT uses the nonstandard name _utime(), but mingw creates
aliases to the POSIX names.)

Change-Id: I513c6c5de05376c34cbb0894a94259acba8ae6f1
2014-07-21 17:10:34 -07:00
Nick Kralevich
ef16a17afb Merge "adb: set O_CLOEXEC on lots of file descriptors" into lmp-dev 2014-07-21 15:42:19 +00:00