Commit Graph

14880 Commits

Author SHA1 Message Date
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
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
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
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
Than McIntosh e8efd0d6bf Move perfprofd to late_start class.
Bug: http://b/19483574
Change-Id: I88649b50b95cbddb7d0671a5499232cbef156c48
2015-05-27 14:02:11 -04:00
Eino-Ville Talvala df93020b28 am 0ca24ff5: Merge "Graphics depth formats: Add confidence values" into mnc-dev
* commit '0ca24ff56b553737e8722e86e6c3b3af4b550d82':
  Graphics depth formats: Add confidence values
2015-05-27 18:01:03 +00:00
Michael Lentine 2d2456b4b6 am 338142aa: Merge "Adding a build id check to blob cache." into mnc-dev
* commit '338142aa81fa4e67065e82cc45bea8424db3a7f4':
  Adding a build id check to blob cache.
2015-05-27 18:01:02 +00:00
Eino-Ville Talvala 0ca24ff56b Merge "Graphics depth formats: Add confidence values" into mnc-dev 2015-05-27 17:40:25 +00:00
Michael Lentine 338142aa81 Merge "Adding a build id check to blob cache." into mnc-dev 2015-05-27 17:39:23 +00:00
Adam Lesinski 9bd7afc0a1 Prevent integer overflow when allocating native_handle_t
User specified values of numInts and numFds can overflow
and cause malloc to allocate less than we expect, causing
heap corruption in subsequent operations on the allocation.

Bug: 19334482
Change-Id: I43c75f536ea4c08f14ca12ca6288660fd2d1ec55
2015-05-27 10:20:03 -07:00
Andres Morales ae242929da [gatekeeperd] return brute-force throttling information
Bug: 21118563
Change-Id: I13c6a44f61668be8b4c1fde8c84dcfebab84517c
2015-05-27 07:45:22 -07:00
Eino-Ville Talvala 20651b5c7d Graphics depth formats: Add confidence values
Supplement the dense and sparse depth image formats with
confidence values.

For {HAL_PIXEL_FORMAT_Y_16, HAL_DATASPACE_DEPTH}, use the 3 MSBs
for confidence.

For {HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_DEPTH}, add a 4th float
value for confidence.

Bug: 20123879
Change-Id: Idc27081efec682a712ce77ccfec59328f298b944
2015-05-26 14:50:48 -07:00
Nick Kralevich d482e6ab96 am 4b7ddd61: Merge "Don\'t use TEMP_FAILURE_RETRY on close()" into mnc-dev
* commit '4b7ddd6105c44b01b473c5ed1035b6be34ba19e2':
  Don't use TEMP_FAILURE_RETRY on close()
2015-05-23 16:23:05 +00:00
Nick Kralevich 4b7ddd6105 Merge "Don't use TEMP_FAILURE_RETRY on close()" into mnc-dev 2015-05-23 16:04:00 +00:00
Nick Kralevich 12c67f4dfe Don't use TEMP_FAILURE_RETRY on close()
See https://lkml.org/lkml/2005/9/10/129 for details.

(cherry-picked from commit 95db36e128)

Bug: 20501816
Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1
2015-05-23 16:03:06 +00:00
Thierry Strudel 604e75449d am 91cf41cf: init: wait_for_file use smaller time resolution
* commit '91cf41cf43847930a8e55b3789d4943a8e22f73a':
  init: wait_for_file use smaller time resolution
2015-05-22 23:48:00 +00:00
Thierry Strudel 91cf41cf43 init: wait_for_file use smaller time resolution
As 1s timeout can be requested, using second resolution time to check
for timeout prevent from being accurate on the actual time we wait.
Use available gettime_ns instead.

Bug: 21374269
Change-Id: I8be1b69e02beacc7196427f97855e036addf54d1
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-05-22 16:03:12 -07:00
Paul Lawrence ffdac6ddf2 am f0b318d6: am 7c789575: Merge "Revert "Set up crypto for user directories in init.""
* commit 'f0b318d61cc129f4ddd25859500857b9f8e34e69':
  Revert "Set up crypto for user directories in init."
2015-05-22 19:41:48 +00:00
Paul Lawrence f0b318d61c am 7c789575: Merge "Revert "Set up crypto for user directories in init.""
* commit '7c7895755cf23140f08b7416ceff006dbbf7a411':
  Revert "Set up crypto for user directories in init."
2015-05-22 19:28:49 +00:00