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

14947 Commits

Author SHA1 Message Date
Elliott Hughes 424af02f36 Fix error handling/reporting for "adb forward" and "adb reverse". 
We really need better infrastructure for parsing adb subcommands, but
in the meantime...

At least this cleans up a little more of the implementation too.

Bug: http://b/20736014
Change-Id: I76209847da3724906c71924017bcb69fa31e0b49
 2015-05-29 18:03:57 -07:00
Evgeniy Stepanov a8cc2081b4 Revert "Fix ODR issues in ART." 
Fails build on Mac.

This reverts commit 2148a1243e.

Change-Id: Ib4f0ba0b0a42500f20b7d73ca91363477fe3d093
 2015-05-30 00:47:30 +00:00
Jeff Brown 20432c237c Merge "Work around spurious epoll notifications." into mnc-dev 2015-05-30 00:43:10 +00:00
Jeff Brown 18a574f715 Work around spurious epoll notifications. 
Sometimes it seems like we can get into a situation where we are
unable to remove an fd from the epoll set but it keeps sending us
events anyhow.  Defensively rebuild the epoll set in this case
to prevent us from spinning forever.

Bug: 21271428
Change-Id: I5607e565f2e12460d7113a1f62a70d38d334e271
 2015-05-29 17:40:25 -07:00
Arman Uguray 0aee2ac3a0 system/audio.h: Make function inline 
This patch makes the audio_device_address_to_parameter inline. All of the other
helpers defined in this header are inline functions except for this one and this
causes compile failures when -Werror=unused-function is used.

BUG=21339022

Change-Id: I7db58bf7bed3b89b6752ec2cd2c1f358ba2a4d89
 2015-05-29 16:12:31 -07:00
Evgenii Stepanov da2a0eff76 am d708a28c: am dd50edcb: Merge "Fix ODR issues in ART." 
* commit 'd708a28cf8e5efcdd3ab76ce8276fcb418a8cb41':
  Fix ODR issues in ART.
 2015-05-29 18:24:33 +00:00
Evgenii Stepanov d708a28cf8 am dd50edcb: Merge "Fix ODR issues in ART." 
* commit 'dd50edcbe71397ca3be0d2d0b782618921cf859f':
  Fix ODR issues in ART.
 2015-05-29 18:08:46 +00:00
Evgenii Stepanov dd50edcbe7 Merge "Fix ODR issues in ART." 2015-05-29 17:55:02 +00:00
Paul Lawrence 0a423d994a DO NOT MERGE Securely encrypt the master key 
(chery-picked from commit 806d10be23)

Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.

Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/148586/
  https://android-review.googlesource.com/#/c/148604/
  https://android-review.googlesource.com/#/c/148606/
  https://android-review.googlesource.com/#/c/148607/

Bug: 18151196

Change-Id: I6a8a18f43ae837e330e2785bd26c2c306ae1816b
 2015-05-29 17:39:16 +00:00
Jim Miller 8724503768 am 53d181dc: Merge "Fix 64-bit build error" into mnc-dev 
* commit '53d181dcb40f3af83379e9d19e03c0026b90bbf1':
  Fix 64-bit build error
 2015-05-29 00:29:06 +00:00
Vineeta Srivastava 0aab798312 Merge "fastboot: Add support for fastboot flashing commands" into mnc-dev 2015-05-28 23:54:41 +00:00
Jim Miller 53d181dcb4 Merge "Fix 64-bit build error" into mnc-dev 2015-05-28 23:10:16 +00:00
Tao Bao 6b0938f7fb am 6484f3d1: Merge "Change pre-recovery into two services" into mnc-dev 
* commit '6484f3d1cb4078c7525e23d16c7e7bcd90afa653':
  Change pre-recovery into two services
 2015-05-28 22:51:29 +00:00
Jim Miller c59a6819af Fix 64-bit build error 
Fixes bug 21491366

Change-Id: Ifd45ed8a0c5188c5fa2be1a9dac45b97c339685a
 2015-05-28 15:47:16 -07:00
Tao Bao 6484f3d1cb Merge "Change pre-recovery into two services" into mnc-dev 2015-05-28 21:48:16 +00:00
Christopher Ferris 4e89c5c1ca am 46021d0a: am a684d9da: Merge "Refactor dump_memory function." 
* commit '46021d0a18fc8cee198714c1c939be79ad8d440e':
  Refactor dump_memory function.
 2015-05-28 20:16:32 +00:00
Badhri Jagan Sridharan a873e1dc02 fastboot: Add support for fastboot flashing commands 
Commands added:
fastboot flashing lock
      - Prevents flashing partitions
fastboot flashing unlock
      - Enable user to flashing partitions
fastboot flashing lock_critical
      - Prevents flashing bootloader related
        paritions
fastboot flashing unlock_critical
      - Enables user to flash bootloader
        related partitions
fastboot flashing get_unlock_ability
      - Query bootloader to check if device is
        locked.

(cherry picked from commit bf11095f92)
Change-Id: Id6db16ba32f7a2b1c3f041a76bd3bdf2d3ab471e
 2015-05-28 19:15:27 +00:00
Christopher Ferris fbabe72886 am 0c3f1ae6: Refactor dump_memory function. 
* commit '0c3f1ae66b693ef0f37066b697cc10a07ef56acc':
  Refactor dump_memory function.
 2015-05-28 19:11:03 +00:00
Christopher Ferris 0c3f1ae66b Refactor dump_memory function. 
- Add dumping memory around registers for x86/x86_64.
- Add unit tests for new dump_memory function.
- Cleanup all of the machine.cpp files.
- Increase the high address check for 32 bit, and decrease the high
  address allowed for 64 bit slightly to match mips64.

Bug: 21206576
(cherry picked from commit e8bc77eb84)

Change-Id: I49ec237e30076a232f084da1072bf9aba15dc0cd
 2015-05-28 11:45:34 -07:00
Christopher Ferris 46021d0a18 am a684d9da: Merge "Refactor dump_memory function." 
* commit 'a684d9dad58eaac4d4833321ae92e7327057f18b':
  Refactor dump_memory function.
 2015-05-28 18:10:42 +00:00
Christopher Ferris a684d9dad5 Merge "Refactor dump_memory function." 2015-05-28 18:02:10 +00:00
Evgenii Stepanov 2148a1243e Fix ODR issues in ART. 
Linking against both libziparchive-host and libz-host results in
libz loaded twice (because it is also linked statically in
libziparchive).

bug: 21365909

Change-Id: Ie924e0b38e4c0811daff06e7c0bfed048e7ca82f
 2015-05-28 10:53:23 -07:00
Than McIntosh 3f1ff96d5d am b37c45e9: Move perfprofd to late_start class. 
* commit 'b37c45e90aa311b4d32a5b21dad5fce93c9761a7':
  Move perfprofd to late_start class.
 2015-05-28 17:30:43 +00:00
Mark Salyzyn 708db86525 am c5a55890: am 4cc6e2e3: Merge "init: expand_props on trigger" 
* commit 'c5a558907a49dae3db6c40c2032a92841c93b2d6':
  init: expand_props on trigger
 2015-05-28 17:19:36 +00:00
Than McIntosh a4fd555fc9 am 51f8aa27: am f166e38b: Merge "Move perfprofd to late_start class." 
* commit '51f8aa27fdc5675cf0e621af6e14625a24720ff0':
  Move perfprofd to late_start class.
 2015-05-28 17:19:32 +00:00
Mark Salyzyn c5a558907a am 4cc6e2e3: Merge "init: expand_props on trigger" 
* commit '4cc6e2e33f9fae58e0d125adcc51171cdc6da435':
  init: expand_props on trigger
 2015-05-28 16:05:35 +00:00
Than McIntosh b37c45e90a Move perfprofd to late_start class. 
Bug: http://b/19483574
Change-Id: I88649b50b95cbddb7d0671a5499232cbef156c48
(cherry picked from commit e8efd0d6bf)
 2015-05-28 11:58:31 -04:00
Mark Salyzyn 4cc6e2e33f Merge "init: expand_props on trigger" 2015-05-28 15:52:25 +00:00
Than McIntosh 51f8aa27fd am f166e38b: Merge "Move perfprofd to late_start class." 
* commit 'f166e38b82aecf7a4aa0c95d557936dba3b8c1fe':
  Move perfprofd to late_start class.
 2015-05-28 13:39:29 +00:00
Than McIntosh f166e38b82 Merge "Move perfprofd to late_start class." 2015-05-28 13:30:35 +00:00
Lorenzo Colitti 4209796136 am 0983a6d5: Merge "Document the -g option to adb install." into mnc-dev 
* commit '0983a6d54c202fde75523f1340bd9c9a168ab98c':
  Document the -g option to adb install.
 2015-05-28 04:06:58 +00:00
Lorenzo Colitti 0983a6d54c Merge "Document the -g option to adb install." into mnc-dev 2015-05-28 03:34:46 +00:00
Lorenzo Colitti 0b3baac512 Document the -g option to adb install. 
Change-Id: I012165df343c24953f1c1cfcdce379bf1b67c624
 2015-05-28 12:03:44 +09:00
Adam Lesinski 67de60c6da am 7f5c8181: am 87b02f23: am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmerge 
* commit '7f5c8181492de0f317551d35a4485f08c6d5c48a':
  Prevent integer overflow when allocating native_handle_t
 2015-05-28 02:09:42 +00:00
Adam Lesinski 7f5c818149 am 87b02f23: am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmerge 
* commit '87b02f23c0996ab487ef15794bf862b3cd3e5137':
  Prevent integer overflow when allocating native_handle_t
 2015-05-28 01:33:18 +00:00
Adam Lesinski 87b02f23c0 am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmerge 
* commit '4e8306419073c93f07c7ac69955d990ffa315d96':
  Prevent integer overflow when allocating native_handle_t
 2015-05-28 01:23:09 +00:00
Adam Lesinski 4e83064190 am 1def25a2: Merge commit \'7ac60686\' into manualmerge 
* commit '1def25a210ca502a97020efb732775d5c2df2d9a':
  Prevent integer overflow when allocating native_handle_t
 2015-05-28 01:03:55 +00:00
Christopher Ferris e8bc77eb84 Refactor dump_memory function. 
- Add dumping memory around registers for x86/x86_64.
- Add unit tests for new dump_memory function.
- Cleanup all of the machine.cpp files.
- Increase the high address check for 32 bit, and decrease the high
  address allowed for 64 bit slightly to match mips64.

Bug: 21206576
Change-Id: I6f75141f3282db48b10f7c695a1cf2eb75a08351
 2015-05-27 17:21:38 -07:00
Adam Lesinski 1def25a210 Merge commit '7ac60686' into manualmerge 
Change-Id: I671a57d906ca6826722fb892627d235b14b822eb
 2015-05-27 17:09:14 -07:00
Adam Lesinski 7ac6068636 am 058ad0b6: am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_handle_t 
* commit '058ad0b6612457c54c7ad6e3b5d5a618d94ae966':
  Prevent integer overflow when allocating native_handle_t
 2015-05-27 23:40:35 +00:00
Adam Lesinski 058ad0b661 am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_handle_t 
* commit 'e8582d65ea03a91b5cdc2c374ec9a420f809138f':
  Prevent integer overflow when allocating native_handle_t
 2015-05-27 23:23:19 +00:00
Elliott Hughes f9bafea1ee am 37d0c58f: am 3464c77b: Merge "Don\'t use TEMP_FAILURE_RETRY on close in system/core." 
* commit '37d0c58ffb89265e47830c7769a23b2683addc40':
  Don't use TEMP_FAILURE_RETRY on close in system/core.
 2015-05-27 23:14:29 +00:00
Adam Lesinski e8582d65ea am 9bd7afc0: Prevent integer overflow when allocating native_handle_t 
* commit '9bd7afc0a1de9589c13355178b6edc709bd0bddf':
  Prevent integer overflow when allocating native_handle_t
 2015-05-27 23:13:06 +00:00
Mark Salyzyn dd0e3162a5 init: expand_props on trigger 
Bug: 19608716
Change-Id: Ifce8bfde04f8e6f707245e0b53400072d94447b2
 2015-05-27 14:06:28 -07:00
Elliott Hughes af02e2403a am 9fc83437: Don\'t use TEMP_FAILURE_RETRY on close in system/core. 
* commit '9fc834377297cb2dcc418e4ce7e38e89dd09812b':
  Don't use TEMP_FAILURE_RETRY on close in system/core.
 2015-05-27 20:51:25 +00:00
Elliott Hughes 37d0c58ffb am 3464c77b: Merge "Don\'t use TEMP_FAILURE_RETRY on close in system/core." 
* commit '3464c77b8d1b22b7f87c27b4a142c5e7b2032571':
  Don't use TEMP_FAILURE_RETRY on close in system/core.
 2015-05-27 20:40:29 +00:00
Andres Morales 0f0a9f8103 am 93f6cba3: Merge "[gatekeeperd] return brute-force throttling information" into mnc-dev 
* commit '93f6cba3ea078186473a448fe018167f4a8dcc5a':
  [gatekeeperd] return brute-force throttling information
 2015-05-27 20:29:42 +00:00
Elliott Hughes 9fc8343772 Don't use TEMP_FAILURE_RETRY on close in system/core. 
Bug: http://b/20501816
Change-Id: I1839b48ee4f891b8431ecb809e37a4566a5b3e50
(cherry picked from commit 47b0134ec2)
 2015-05-27 13:27:06 -07:00
Elliott Hughes 3464c77b8d Merge "Don't use TEMP_FAILURE_RETRY on close in system/core." 2015-05-27 20:24:08 +00:00
Andres Morales 93f6cba3ea Merge "[gatekeeperd] return brute-force throttling information" into mnc-dev 2015-05-27 18:37:38 +00:00