openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,460 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

786 Commits

Author SHA1 Message Date
Christopher Ferris 8e8ae85754 am ae7bf095: Fix adb/fastboot windows compilations. 
* commit 'ae7bf0959bd3f79afbf365e41f015ed1c304afdc':
  Fix adb/fastboot windows compilations.
 2014-11-07 03:49:08 +00:00
Christopher Ferris ae7bf0959b Fix adb/fastboot windows compilations. 
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
 2014-11-06 14:34:24 -08:00
Elliott Hughes 7e34ab181a am 1635b81b: am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb" 
* commit '1635b81b22abeb930feb02c63a1f5678a1386231':
  Add razer usb vid for future use with adb
 2014-11-05 03:29:44 +00:00
Elliott Hughes 1635b81b22 am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb" 
* commit '2655256570b7c1c5af6d886735835eecb99f45f2':
  Add razer usb vid for future use with adb
 2014-11-05 02:57:28 +00:00
Elliott Hughes 2655256570 am 452f08a0: Merge "Add razer usb vid for future use with adb" 
* commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c':
  Add razer usb vid for future use with adb
 2014-11-05 02:42:04 +00:00
Stuart Wells 3410d33dc4 Add razer usb vid for future use with adb 
Change-Id: I6b76c297de900da050473b764517cfd15c64b838
Signed-off-by: Stuart Wells <stuart.wells@razerzone.com>
 2014-11-03 09:32:30 -08:00
Badhri Jagan Sridharan e124f24c5b Merge "adbd & fastbootd: Support for new f_fs descriptor format" 2014-10-28 17:30:40 +00:00
Paul Lawrence d1abdeac3e am 6331781a: Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev automerge: 3dbcc8b 
* commit '6331781a7507c4c3f86c37781cc715baaaa9814c':
  adb warns on remount when verity is enabled
 2014-10-28 07:15:29 +00:00
Badhri Jagan Sridharan fad60336da adbd & fastbootd: Support for new f_fs descriptor format 
The patch "[RFC] usb: gadget: f_fs: Add flags
to  descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.

This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.

Bug: 17394972
Change-Id: I05095ccdcc74bf6953cbef847d7583eab137e12e
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
 2014-10-28 01:59:17 +00:00
Paul Lawrence 6331781a75 Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev 
automerge: 3dbcc8b

* commit '3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe':
  adb warns on remount when verity is enabled
 2014-10-28 00:25:30 +00:00
Paul Lawrence f643beced1 adb warns on remount when verity is enabled 
Bug: 18119147
Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
 2014-10-27 10:56:31 -07:00
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
JP Abgrall cb3739b545 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:24 +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 f17c42f68a am 2f431a8d: Fix windows-specific error without messing up Makefile flags. 
* commit '2f431a8d5a1c2029af470a7336751a555131ee51':
  Fix windows-specific error without messing up Makefile flags.
 2014-10-02 00:53:27 +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 d2ee707586 am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions. 
* commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75':
  Fix build breakage for missing -Wcpp option on old GCC versions.
 2014-10-02 00:31:50 +00: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 1e95e0b19c am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev 
* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
  Remove obsolete reference to ddk; Fixes for -Werror
 2014-10-01 23:21:09 +00: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
Vince Harron 43aecc5436 am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev 
* commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e':
  fix for adbd pinning CPU
 2014-09-30 14:56:25 +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 1f88f8ef32 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:52 +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 736fd4a870 am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" 
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
  Revert "Switch adb to epoll(2)."
 2014-09-25 22:32:18 +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