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

767 commits

Author SHA1 Message Date
JP Abgrall
6d463a5f41 am 1b338c67: am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH" 
* commit '1b338c6784cfe040a74acb58a6c6902d9cab3d8f':
  adb: Add USB vendor ID for TrekStor GmbH
 2014-10-20 18:44:39 +00:00
JP Abgrall
1b338c6784 am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH" 
* commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3':
  adb: Add USB vendor ID for TrekStor GmbH
 2014-10-20 18:38:37 +00:00
Thorsten Koroscha
4fa99e542f adb: Add USB vendor ID for TrekStor GmbH 
Change-Id: I1d7fc14e691b4ab504c5205b21c93939499cdff9
Signed-off-by: Thorsten Koroscha <t.koroscha@trekstor.de>
 2014-10-20 10:26:20 +02:00
Paul Lawrence
4e41eede41 am 6e9857da: resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp 
* commit '6e9857da67d46d658e28f73500f08182a9b15b7e':
  Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
 2014-10-10 16:53:17 +00:00
Paul Lawrence
6e9857da67 resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp 
Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
 2014-10-10 09:07:21 -07:00
Paul Lawrence
a37c834b57 am c638c664: resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp 
* commit 'c638c6647d0a8e30b2e176e36b1c08ef57766f06':
  Revert "Enable verity on userdebug, and add disable-verity to adb"
 2014-10-09 22:27:09 +00:00
Paul Lawrence
c638c6647d resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp 
Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
 2014-10-09 15:17:23 -07:00
Paul Lawrence
6841aefbbc am cc496dbc: resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp 
* commit 'cc496dbcd709230c35016e3d84ad06d1e44de9b8':
  Enable verity on userdebug, and add disable-verity to adb
 2014-10-09 21:34:38 +00:00
Paul Lawrence
cc496dbcd7 resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp 
Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
 2014-10-09 13:24:06 -07:00
Paul Lawrence
bbb3631911 Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"" 
This reverts commit 152d2d4234.

Fixed build error, and also fixed memory leak spotted from warning.

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
 2014-10-09 09:05:36 -07:00
Nick Kralevich
152d2d4234 Revert "Enable verity on userdebug, and add disable-verity to adb" 
Build is broken.

system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity':
system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized]
     if (!RSA_verify(key,
                    ^
system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here
     char *verity_table_signature;
           ^
cc1: all warnings being treated as errors
make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1
make: *** Waiting for unfinished jobs....

This reverts commit d4cea0bc16.

Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
 2014-10-08 23:55:05 +00:00
Paul Lawrence
d4cea0bc16 Enable verity on userdebug, and add disable-verity to adb 
Bug: 17691572

Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
 2014-10-08 15:24:37 -07:00
Stephen Hines
f39f24df24 am 0d8b1bdc: am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags. 
* commit '0d8b1bdcce553a60fb9112ca403c00ad9d8842a5':
  Fix windows-specific error without messing up Makefile flags.
 2014-10-02 13:53:01 +00:00
Stephen Hines
f1ee5cd0ad am 4c4fa1a5: am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions. 
* commit '4c4fa1a57fcf7aaf174655532b19b813a7f43ad3':
  Fix build breakage for missing -Wcpp option on old GCC versions.
 2014-10-02 13:53:00 +00:00
Stephen Hines
82921192f4 am f9d61a00: am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev 
* commit 'f9d61a007426f47337f9842930b15c2160281c58':
  Remove obsolete reference to ddk; Fixes for -Werror
 2014-10-02 13:52:59 +00:00
Stephen Hines
0d8b1bdcce am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags. 
* commit 'a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c':
  Fix windows-specific error without messing up Makefile flags.
 2014-10-02 13:38:33 +00:00
Stephen Hines
4c4fa1a57f am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions. 
* commit '541a780454ca5299a96a5d9bae1fcb650a0c0659':
  Fix build breakage for missing -Wcpp option on old GCC versions.
 2014-10-02 13:38:25 +00:00
Stephen Hines
f9d61a0074 am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev 
* commit '4acabfee9e00962be02d06a6771da2e7ade20859':
  Remove obsolete reference to ddk; Fixes for -Werror
 2014-10-02 13:37:26 +00:00
Stephen Hines
2f431a8d5a Fix windows-specific error without messing up Makefile flags. 
Bug: 14416410

The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.

Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
 2014-10-01 17:37:06 -07:00
Stephen Hines
3ea87c33a1 Fix build breakage for missing -Wcpp option on old GCC versions. 
Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
 2014-10-01 17:16:37 -07:00
Stephen Hines
64f44b8444 Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev 2014-10-01 22:53:51 +00:00
Vince Harron
3dbb5fbe02 am ada485e3: am 0edbf89e: am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev 
* commit 'ada485e38c5c9944c173bcb569c6841c2fb6d5f0':
  fix for adbd pinning CPU
 2014-10-01 02:14:12 +00:00
Vince Harron
ada485e38c am 0edbf89e: am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev 
* commit '0edbf89e687802d4c92fb8b81af1a0715017aa8f':
  fix for adbd pinning CPU
 2014-10-01 01:43:33 +00:00
Andrew Hsieh
b75d6f1429 Remove obsolete reference to ddk; Fixes for -Werror 
Bug: 14416410

1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk
   in x86_64-w64-mingw32/include/ddk
2. Add -Wno-error=cpp to suppress a warning that turns into error
   thanks to -Werror:

      Please include winsock2.h before windows.h
3. Cast GetLastError() return type DWORD to "int"
4. Include direct.h for _mkdir
5. Include stdint.h for uint8_t on Windows

Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
 2014-09-30 02:24:07 -07:00
Alex Klyubin
9482d77a84 am 1028f781: am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs." 
* commit '1028f781aa3aaefc0ab53bd8038fd137135a947b':
  Switch from using base64 BIOs to encoding funcs.
 2014-09-29 19:44:18 +00:00
Alex Klyubin
1028f781aa am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs." 
* commit '9005ec378ecd281f52945b5baca87245543bbfbf':
  Switch from using base64 BIOs to encoding funcs.
 2014-09-26 21:58:45 +00:00
Alex Klyubin
e3d3016d46 Merge "Switch from using base64 BIOs to encoding funcs." 2014-09-26 21:51:36 +00:00
Vince Harron
af436b1e10 fix for adbd pinning CPU 
adbd was spinning between select & read (0 bytes) for an adb_auth
socket.  The read documentation states: "On success, the number of
bytes read is returned (zero indicates end of file)" so the code has
been modified to close the connection (like the read error case).

BUG=17419868

Change-Id: I1d8fb70c8e1876225ba8d47ea0a2b6265a7d182b
 2014-09-25 21:51:15 -07:00
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
a5ab96eb50 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-15 15:46:13 -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