ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10962 commits 1 branch 0 tags 217 MiB
Commit graph

737 commits

Author SHA1 Message Date
Dan Albert
628e4b767f am 0df62a7e: am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" 
* commit '0df62a7e1511667043ced8f57b2dab072fb88dd5':
  Revert "Switch adb to epoll(2)."
 2014-09-25 22:44:16 +00:00
Dan Albert
0df62a7e15 am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" 
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
  Revert "Switch adb to epoll(2)."
 2014-09-25 22:32:26 +00:00
Dan Albert
45741ae2ea Revert "Switch adb to epoll(2)." 
This reverts commit 67de1557b0.
 2014-09-25 15:10:34 -07:00
Elliott Hughes
e4090c92ff am 4f3ebaec: am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)." 
* commit '4f3ebaec16e7f899c4afb39ce9e08db6b989428c':
  Switch adb to epoll(2).
 2014-09-23 20:56:38 +00:00
Elliott Hughes
4f3ebaec16 am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)." 
* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
  Switch adb to epoll(2).
 2014-09-23 18:57:42 +00:00
Elliott Hughes
67de1557b0 Switch adb to epoll(2). 
Bug: 17588403
Change-Id: I2590f5e7dd4e178ff4f743609c5ef0155b1015a1
 2014-09-23 10:40:51 -07:00
Doug Zongker
edda73d0c8 fix windows build 
(cherry-picked from commit 4b39c6aca9)

Change-Id: Ia7b236f1a915630fe85d488072efb9784ba10dad
 2014-09-16 10:59:49 -07:00
Kenny Root
d372c5c365 Merge changes I11e84a7b,I5adaedd8 
* changes:
  adb: fix 64-bit build
  add sideload-host mode to adb
 2014-09-16 17:36:13 +00:00
Colin Cross
52e0b61999 adb: fix 64-bit build 
strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.

(cherry-picked from commit 6d6a898b0c)

Change-Id: I11e84a7b62c935162abc0aba910d14e63d11efd3
 2014-09-16 10:31:30 -07:00
Doug Zongker
8e49ae4bb8 add sideload-host mode to adb 
The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer.  It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.

If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.

(cherry-picked from commit 71fe584a1a)

Change-Id: I5adaedd8243dc3b76414bba0149879ca2bbf35fa
 2014-09-16 10:27:38 -07:00
Esteban de la Canal
4b22ed37ab am da5b2d67: am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac." 
* commit 'da5b2d67faeb2a85f042cf5b23d9875ad3413183':
  74602: Fixes adb not seeing connected devices on Mac.
 2014-09-13 02:25:15 +00:00
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
246458a009 am 8fa75e44: am 6608a46c: am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited" 
* commit '8fa75e44f182afb9eddeb11dbb67e78397165bab':
  adb: Add USB vendor ID for Alco Digital Devices Limited
 2014-09-11 14:16:02 +00: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
8a4b028f72 am 84e533d7: am 228f8261: Merge "delete_file() should force removal." into lmp-dev 
* commit '84e533d7b06de2dfd2a40b577ef22877e0e499af':
  delete_file() should force removal.
 2014-09-09 22:16:01 +00: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
a9aa7abad6 am fb849bd4: am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles." 
* commit 'fb849bd46e28bd47a0545cf56d6683d138f5f09d':
  Add -Wno-deprecated-declarations to makefiles.
 2014-09-06 17:38:27 +00: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
e14c9a4617 am 6d94763b: am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST." 
* commit '6d94763b2fd88a66197927d3233eff91e2b8044a':
  Include ADB_HOST only code in #if ADB_HOST.
 2014-09-06 00:10:38 +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
Elliott Hughes
317a4df754 am 709569fe: am 0dcc3f65: am 9c814648: Merge "Add USB Vendor ID for Micromax Informatics Ltd." 
* commit '709569febf97ab2f3c94a28c42cce06ebf56114c':
  Add USB Vendor ID for Micromax Informatics Ltd.
 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
leozwang
0f1fda9ee8 Fix build on mac. 
On mac require a case.
Also, this code is not portable, will fix it in long run.

Change-Id: I76194b62cea29bd3d21c7ba6c3da4d549bea4738
 2014-08-22 22:37:18 +00:00
leozwang
adb09fa01a Add more debug information. 
Re-commit https://googleplex-android-review.googlesource.com/#/c/519430/
Add fix for win_sdk build.

Add socketpair debug log.
Also output thread information in log on host side.

Change-Id: I21021bc111a3f7362a91b70593e3738125878118
 2014-08-22 16:11:58 +00: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
Leo Wang
8ca7c019d5 Merge "Revert "Add more debug information."" 2014-08-14 14:27:41 +00:00
Leo Wang
2a0c93a8dd Revert "Add more debug information." 
This reverts commit 8693bc7abd.

Change-Id: I7e6df6c155d9a7544c860b21bcb31c4e04d122e7
 2014-08-15 02:47:57 +00:00
Ying Wang
567c0f1d62 am 0c3d98b0: am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build." 
* commit '0c3d98b02b74fc64c78e57c07ae6b81eff3a8888':
  Fix 64-bit host build.
 2014-08-14 23:25:57 +00:00
leozwang
8693bc7abd Add more debug information. 
Add socketpair debug log.
Also output thread information in log on host side.

Change-Id: I38168990d77e53eff69cb70f442cc4e7acb4b20f
 2014-08-14 03:34:53 +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