Commit graph

6449 commits

Author SHA1 Message Date
Alex Klyubin
ea1f56e7ff am b1dd1765: am b42fc74f: Merge "Expose /dev/hw_random to group "system"."
* commit 'b1dd176520896efacbabd1df65d8bb56e1bfeb71':
  Expose /dev/hw_random to group "system".
2013-10-03 15:15:43 -07:00
Alex Klyubin
b1dd176520 am b42fc74f: Merge "Expose /dev/hw_random to group "system"."
* commit 'b42fc74f0db60e1e86deaf527b3b7e7ec53dcc54':
  Expose /dev/hw_random to group "system".
2013-10-03 15:14:13 -07:00
Alex Klyubin
b42fc74f0d Merge "Expose /dev/hw_random to group "system"." 2013-10-03 22:12:16 +00:00
Alex Klyubin
b2478a713a Expose /dev/hw_random to group "system".
This is needed to let EntropyMixer (runs inside system_server) read
from /dev/hw_random.

Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
2013-10-03 13:32:36 -07:00
Christopher Ferris
7bdb7b4222 am 81890fd8: am 5daba1e0: Merge "Only build host library on linux-x86."
* commit '81890fd80ffda1cbb259912b0e5ee29a5fa8c617':
  Only build host library on linux-x86.
2013-10-02 14:31:46 -07:00
Colin Cross
903e6865ca am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"
* commit 'b024bbf6a1daf752a8d756bfda472fe6fb48dd9e':
  Handle screendumps for all framebuffer sizes
2013-10-02 14:31:46 -07:00
Christopher Ferris
81890fd80f am 5daba1e0: Merge "Only build host library on linux-x86."
* commit '5daba1e0ee1c7cb21b3f8001ab6806834884f0d0':
  Only build host library on linux-x86.
2013-10-02 14:28:35 -07:00
Colin Cross
b024bbf6a1 am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"
* commit '6da66ef49b7c35cc5050a4a6b9771801640fb99b':
  Handle screendumps for all framebuffer sizes
2013-10-02 14:28:34 -07:00
Christopher Ferris
5daba1e0ee Merge "Only build host library on linux-x86." 2013-10-02 21:26:05 +00:00
Christopher Ferris
9e1ee2b3c6 Only build host library on linux-x86.
Change-Id: I26d5bd4b34c3669897fea1488fa58972f4299757
2013-10-02 14:19:19 -07:00
Colin Cross
6da66ef49b Merge "Handle screendumps for all framebuffer sizes" 2013-10-02 20:24:46 +00:00
Christopher Ferris
e6cfee1b91 am 0e9abad8: am f3217de3: Merge "Fix problems in libbacktrace."
* commit '0e9abad8d22868bc2039380df2f4b29edd248402':
  Fix problems in libbacktrace.
2013-10-01 18:53:51 -07:00
Colin Cross
0d3ac55d06 am 230252d5: am 61afb07b: Merge "Trigger a policy reload from post-fs-data."
* commit '230252d5cd70f5be4c24046c7a409e9498ac97f5':
  Trigger a policy reload from post-fs-data.
2013-10-01 18:53:51 -07:00
Christopher Ferris
0e9abad8d2 am f3217de3: Merge "Fix problems in libbacktrace."
* commit 'f3217de32cff8f82a22de84f35d782307a4ed4da':
  Fix problems in libbacktrace.
2013-10-01 18:50:19 -07:00
Colin Cross
230252d5cd am 61afb07b: Merge "Trigger a policy reload from post-fs-data."
* commit '61afb07b9b14233f76a969840f74ce1ced22bf58':
  Trigger a policy reload from post-fs-data.
2013-10-01 18:50:18 -07:00
Christopher Ferris
f3217de32c Merge "Fix problems in libbacktrace." 2013-10-02 01:48:59 +00:00
Christopher Ferris
a16a4e10e1 Fix problems in libbacktrace.
- Add a wait for stop to backtrace_test. There is a possible race
  condition that is exposed when using libunwind.
- Fix a few calls to unwind function calls.

Bug: 8410085
Change-Id: I7487d687f6d4b7b05b8a96ad1c5f7183681e5c95
2013-10-01 18:08:03 -07:00
William Luh
9293ea4c86 am e3e22062: Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev
* commit 'e3e22062f0a00bc23dade9c6f06d41e76dd7b351':
  Add new cert_pin_failure tag that can be used in user-consent filtering.
2013-10-01 05:26:11 -07:00
William Luh
e3e22062f0 Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev 2013-09-30 20:19:20 +00:00
Colin Cross
61afb07b9b Merge "Trigger a policy reload from post-fs-data." 2013-09-30 20:04:12 +00:00
Christopher Ferris
44b23fd6aa am 3f0a5e9c: am 71a8aa34: Merge "Update comment from review."
* commit '3f0a5e9c9f279546fc5c89c61053554ef6eb43d3':
  Update comment from review.
2013-09-30 11:25:55 -07:00
Christopher Ferris
3f0a5e9c9f am 71a8aa34: Merge "Update comment from review."
* commit '71a8aa347383fa5891a43aaa587fe67be166d5c4':
  Update comment from review.
2013-09-30 11:24:25 -07:00
Christopher Ferris
71a8aa3473 Merge "Update comment from review." 2013-09-30 18:21:15 +00:00
Christopher Ferris
7eb36bf4b6 am 7f21826c: am f41cf208: Merge "Create a single backtrace library."
* commit '7f21826c478088b4717cc6c7d1ff6ef3d7da464a':
  Create a single backtrace library.
2013-09-30 11:17:31 -07:00
Christopher Ferris
474afff229 Update comment from review.
Missed this typo that enh pointed out.

Bug: 8410085
Change-Id: Ic636ae218fc153bc5e3b1a0fdc2f7161980e5eec
2013-09-30 11:16:17 -07:00
Christopher Ferris
7f21826c47 am f41cf208: Merge "Create a single backtrace library."
* commit 'f41cf2086d759987708321772f0c67f7d7034509':
  Create a single backtrace library.
2013-09-30 11:14:52 -07:00
Christopher Ferris
f41cf2086d Merge "Create a single backtrace library." 2013-09-30 18:02:54 +00:00
Christopher Ferris
7fb22878d4 Create a single backtrace library.
This library will be used to abstract away getting backtrace
data from how it is implemented. This is the first step to
replacing libcorkscrew with libunwind.

Bug: 8410085
Change-Id: Ie8f159e96a055d378e1ddc72d40239fba4cf52b7
2013-09-28 12:26:35 -07:00
Ying Wang
f47c01da18 am 1690a5a6: am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"
* commit '1690a5a6943d4e4b65d5e4dcd077702c2c8f40a0':
  Use SSE2 enhanced memset for capable x86 processors
2013-09-26 10:56:52 -07:00
Ying Wang
1690a5a694 am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"
* commit 'aa62be65eddc68b29ab9d7993f0311738d24bfcf':
  Use SSE2 enhanced memset for capable x86 processors
2013-09-26 10:55:27 -07:00
Adam Lesinski
71ddce5927 am bbe4c49b: Merge "Moves libmemtrack header to standard location" into klp-dev
* commit 'bbe4c49b4eb664ca018ff670a4dcbf5b9de9a810':
  Moves libmemtrack header to standard location
2013-09-26 10:27:55 -07:00
Adam Lesinski
bbe4c49b4e Merge "Moves libmemtrack header to standard location" into klp-dev 2013-09-26 17:22:15 +00:00
Ying Wang
aa62be65ed Merge "Use SSE2 enhanced memset for capable x86 processors" 2013-09-26 17:08:02 +00:00
William Luh
5336758595 Add new cert_pin_failure tag that can be used in user-consent filtering.
Bug: 10912373
Change-Id: If8a2f9829b3aac4abc33a4623c5f5b4966fd6870
2013-09-25 22:20:23 +00:00
jp abgrall
8f4c14f1e7 am 08170103: am 91962669: Merge "cutils: list: add list_for_each_safe"
* commit '0817010366feecb53fc70719b3784dd7c6d66b55':
  cutils: list: add list_for_each_safe
2013-09-25 11:36:02 -07:00
jp abgrall
0817010366 am 91962669: Merge "cutils: list: add list_for_each_safe"
* commit '919626693999d8d3f22e12477d35c067594a6387':
  cutils: list: add list_for_each_safe
2013-09-25 11:34:29 -07:00
jp abgrall
9196266939 Merge "cutils: list: add list_for_each_safe" 2013-09-25 18:31:44 +00:00
Kenny Root
7d343236f3 am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3
* commit '6d06b01cf4237bd43b6e13f1683fcfc4dae83e78':
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 09:36:50 -07:00
Kenny Root
6d06b01cf4 am e245b8fb: Merge changes I9f858204,Ib35643b3
* commit 'e245b8fb5d3d5b3fe23cbc82ba79c6caaee901f2':
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 09:33:57 -07:00
Kenny Root
e245b8fb5d Merge changes I9f858204,Ib35643b3
* changes:
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 16:31:44 +00:00
Doug Zongker
0a862dcd63 mincrypt: merge the two RSA verifiers
The e=3 and e=65537 implementations are nearly identical, refactor
them down into one.

(cherry picked from commit 8fdbf97652)

Change-Id: I9f858204d52a0ae880170d955bf8f29fed57ee94
2013-09-25 09:26:51 -07:00
Doug Zongker
8e5b63d045 mincrypt: support SHA-256 hash algorithm
- adds a library to compute the SHA-256 hash

- updates the RSA verifier to take an argument specifying either SHA-1
  or SHA-256

- updates DumpPublicKey to with new "key" version numbers for
  specifying SHA-256

- adds new argument to adb auth code to maintain existing behavior

(cherry picked from commit 515e1639ef)

Change-Id: Ib35643b3d864742e817ac6e725499b451e45afcf
2013-09-25 09:26:34 -07:00
Chris Dearman
85373f4280 Handle screendumps for all framebuffer sizes
readx() treats a partial read as an error but also consumes the data,
Now exactly the amount of data needed for the screendump is requested.

This bug showed up for framebuffers that were not a multiple of 640
bytes.

Also fix a compiler warning related to handing pipe() failure.

Change-Id: I8b1713923e156d4e3424784152e5dc5cbc7d478d
2013-09-25 02:43:45 -07:00
Benoit Goby
4820022b5e am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit '0b7d588d531691904530ba57d772b31fb24ed343':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:15:43 -07:00
Benoit Goby
0b7d588d53 am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit 'f2c4c4ada725b86e6581a89cc06e2836d4bdc6e3':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:13:17 -07:00
Benoit Goby
f2c4c4ada7 Merge "init: Fix queue_all_property_triggers with nonexistent properties" 2013-09-24 23:10:44 +00:00
Ben Cheng
bcea352d2c am d38cc182: Merge "Disable timestamp logging." into klp-dev
* commit 'd38cc182dbfce4a1d7e8e9c16bff10b71128cc01':
  Disable timestamp logging.
2013-09-24 15:44:12 -07:00
Ben Cheng
d38cc182db Merge "Disable timestamp logging." into klp-dev 2013-09-24 22:39:11 +00:00
Benoit Goby
d679e1b572 init: Fix queue_all_property_triggers with nonexistent properties
Don't queue actions for "on property=*" if the property does not exist.
This fixes these errors on boot:

    init: property 'sys.powerctl' doesn't exist while
    expanding '${sys.powerctl}'
    init: powerctl: cannot expand '${sys.powerctl}

Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9
2013-09-24 15:20:34 -07:00
Daniel Leung
51546ee32c Use SSE2 enhanced memset for capable x86 processors
Originally, if TARGET_ARCH_VARIANT is x86-atom, the SSE2 enhanced
memset is used. This patch extends this to all x86 processors which
support SSE2 (i.e. ARCH_X86_HAVE_SSE2 is true).

Indentation added to the ifeq cases to make this easier to read.

Change-Id: I05f49e237a95359d3f2e3216b037e3fc1a0fbcb0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-09-24 12:53:18 -07:00