Elliott Hughes
7f7b12b8eb
am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset versions"
...
* commit '5baecee3c6bf348b77b8785bcd8e35362a3507fb':
Cleanup x86 flags and memset versions
2013-10-10 10:40:10 -07:00
Elliott Hughes
45ddf18496
am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."
...
* commit '9b8a929dc4375b91dde2e8d34df1b0b485ae3b23':
libcutils doesn't need to be looking at bionic's privates.
2013-10-10 10:33:46 -07:00
Elliott Hughes
5baecee3c6
am be18538d: Merge "Cleanup x86 flags and memset versions"
...
* commit 'be18538d4373364b6c9b1149a24974976169f52f':
Cleanup x86 flags and memset versions
2013-10-10 10:33:43 -07:00
Elliott Hughes
9b8a929dc4
Merge "libcutils doesn't need to be looking at bionic's privates."
2013-10-10 17:00:46 +00:00
Elliott Hughes
478c566a90
libcutils doesn't need to be looking at bionic's privates.
...
Change-Id: Ib11a0c1bdc4b85c58274b21a07aa92f958d23713
2013-10-10 09:50:56 -07:00
Elliott Hughes
be18538d43
Merge "Cleanup x86 flags and memset versions"
2013-10-10 16:46:50 +00:00
Pavel Chupin
4aa51cd468
Cleanup x86 flags and memset versions
...
ARCH_X86_HAVE_SSE2 is always true
Change-Id: I680493d14280aafad5448aec727e8d9a84a6db00
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-10 20:20:16 +04:00
Christopher Ferris
f84f7fa4d2
am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."
...
* commit '9492b6e72cef71422ba624e3cd11f07156cfb34a':
Fix bug in abort message processing.
2013-10-09 23:08:59 -07:00
Christopher Ferris
9492b6e72c
am 2de8102d: Merge "Fix bug in abort message processing."
...
* commit '2de8102d422f48eec44fe8782cd2411f04f1dcb2':
Fix bug in abort message processing.
2013-10-09 23:06:51 -07:00
Christopher Ferris
2de8102d42
Merge "Fix bug in abort message processing."
2013-10-10 06:03:41 +00:00
Christopher Ferris
dbd2ab4dca
Fix bug in abort message processing.
...
Bug: 11156592
Change-Id: I4b82e7be5d7fccd167f6c52f78a5af3d3a553779
2013-10-09 18:31:40 -07:00
Kenny Root
db0850c3b6
Add support for ECDSA P-256 with SHA256
...
This adds a small EC library that is capable of verifying a signature of
SHA256 with ECDSA on the NIST P-256 curve.
Change-Id: I2a16639c92a77e8e4783c47ffbc56676de56eb59
2013-10-09 17:04:50 -07:00
The Android Automerger
19ebdadee4
merge in klp-release history after reset to klp-dev
2013-10-09 06:02:11 -07:00
Ed Heyl
1101c1eb1a
am 1c39fdcd: merge in KQS81M
...
* commit '1c39fdcd9eb628338d7f273e43723585ca35721a':
Only check caller when deriving permissions.
Fix recursive locking bug.
2013-10-08 15:58:23 -07:00
Ed Heyl
1c39fdcd9e
merge in KQS81M
2013-10-08 15:45:06 -07:00
Jeff Sharkey
a5fdea7189
am e93a0517: Set GID required to write, media_rw mount point.
...
* commit 'e93a0517f4c88310066ac39c6b268ebfcceef44e':
Set GID required to write, media_rw mount point.
2013-10-08 14:12:38 -07:00
Jeff Sharkey
e93a0517f4
Set GID required to write, media_rw mount point.
...
Add sdcard FUSE daemon flag to specify the GID required for a package
to have write access. Normally sdcard_rw, but it will be media_rw
for secondary external storage devices, so DefaultContainerService
can still clean up package directories after uninstall.
Create /mnt/media_rw which is where vold will mount raw secondary
external storage devices before wrapping them in a FUSE instance.
Bug: 10330128, 10330229
Change-Id: I4385c36fd9035cdf56892aaf7b36ef4b81f4418a
2013-10-08 12:56:37 -07:00
Christopher Ferris
816c9a64f9
am fa135f5c: am 7dbe9660: Merge "Update debuggerd to use libbacktrace."
...
* commit 'fa135f5ce95a8eff2ff51c03ad2e9d9b2a8b2274':
Update debuggerd to use libbacktrace.
2013-10-04 15:42:14 -07:00
Christopher Ferris
fa135f5ce9
am 7dbe9660: Merge "Update debuggerd to use libbacktrace."
...
* commit '7dbe96602cde4822d22f17b85e33027563e8c521':
Update debuggerd to use libbacktrace.
2013-10-04 15:40:19 -07:00
Christopher Ferris
7dbe96602c
Merge "Update debuggerd to use libbacktrace."
2013-10-04 22:37:36 +00:00
Colin Cross
ad2961397f
am 410f8c30: am 79b277ab: Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."
...
* commit '410f8c305b416484f17f068c37b785605a2f69eb':
Set security context of /adb_keys and /data/misc/adb/adb_keys.
2013-10-03 15:15:43 -07:00
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
Colin Cross
410f8c305b
am 79b277ab: Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."
...
* commit '79b277ab73711313690d03a9fb2e9cb3f9242b39':
Set security context of /adb_keys and /data/misc/adb/adb_keys.
2013-10-03 15:14:14 -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
Colin Cross
79b277ab73
Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."
2013-10-03 22:13:06 +00: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
365e4ae745
Update debuggerd to use libbacktrace.
...
Remove all of the code in debuggerd that uses libcorkscrew directly
and replace with libbacktrace.
Also do a bit of refactoring to clean up some functions that were
passing around variables that weren't used.
Bug: 8410085
Change-Id: I27da4fbe3f12ce38a85b4432fc1119984c9c391b
2013-10-03 11:07:56 -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
Stephen Smalley
deb41e5127
Set security context of /adb_keys and /data/misc/adb/adb_keys.
...
I97b3d86a69681330bba549491a2fb39df6cf20ef introduced a separate type
for the adb_keys file. Set the security context of the adb_keys file
accordingly by adding restorecon commands to init.rc.
Change-Id: I30e4d2a1ae223a03eadee58a883c79932fff59fe
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-10-01 09:21:47 -04:00
The Android Automerger
f981b1ed0f
merge in klp-release history after reset to klp-dev
2013-10-01 06:01:48 -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