Christopher Ferris
90a5df40bd
am f84f7fa4
: am 9492b6e7
: am 2de8102d
: Merge "Fix bug in abort message processing."
...
* commit 'f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5':
Fix bug in abort message processing.
2013-10-10 08:33:19 -07: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
Ed Heyl
885cb6877c
am 1101c1eb
: am 1c39fdcd
: merge in KQS81M
...
* commit '1101c1eb1a2c670bee7689587504de34d0306882':
Only check caller when deriving permissions.
Fix recursive locking bug.
2013-10-09 09:12:49 -07:00
The Android Automerger
19ebdadee4
merge in klp-release history after reset to klp-dev
2013-10-09 06:02:11 -07:00
Jeff Sharkey
eef6fca832
am a5fdea71
: am e93a0517
: Set GID required to write, media_rw mount point.
...
* commit 'a5fdea7189239d7edeafa528c299306cba55e6c6':
Set GID required to write, media_rw mount point.
2013-10-08 16:02:41 -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
8511a3da02
am 816c9a64
: am fa135f5c
: am 7dbe9660
: Merge "Update debuggerd to use libbacktrace."
...
* commit '816c9a64f968b62eb60fa4060bcab614821b8f54':
Update debuggerd to use libbacktrace.
2013-10-04 17:36:33 -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
544020895c
Merge "Fastbootd: Comments and general cleaning"
2013-10-04 20:45:18 +00:00
Colin Cross
6b817760e9
Merge "Fastbootd: General fixes and changes"
2013-10-04 20:44:30 +00:00
Szymon Starzycki
9e786b4557
Fastbootd: Comments and general cleaning
...
Alignment fix for fastbootd gpt_mmap
Change-Id: I86482e1645672daae1c8e4a4455c6291c0805fb0
2013-10-04 11:04:43 -07:00
Szymon Starzycki
8fa2f34fd5
Fastbootd: General fixes and changes
...
read data once bug fix
ability to run fastbootd without network and named socket configuration in init.rc
vendortrigger name changed to fastbootd
deleted unused function from default implementation of OEM library
Change-Id: Ib957fae8172530f20d51bb51b5e07bccab07e555
2013-10-03 16:48:45 -07:00
Colin Cross
dc722ee329
Merge changes I1a27459b,I3e9c53c3,I91082f58,I395e5361
...
* changes:
Revert "Revert "Fastbootd: flashing certification""
Fastbootd: auto ssh server start
Fastbootd: network auto discovery
Fastbootd: socket and network transport
2013-10-03 23:04:23 +00:00
Colin Cross
ecb2e3903b
am ad296139
: am 410f8c30
: am 79b277ab
: Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."
...
* commit 'ad2961397f1c7b79b114672108a3bc9b87dc8174':
Set security context of /adb_keys and /data/misc/adb/adb_keys.
2013-10-03 15:17:53 -07:00
Alex Klyubin
dcf2771bb7
am ea1f56e7
: am b1dd1765
: am b42fc74f
: Merge "Expose /dev/hw_random to group "system"."
...
* commit 'ea1f56e7ffec235cc5d48e7cd9cb7d39f4ba1598':
Expose /dev/hw_random to group "system".
2013-10-03 15:17:53 -07: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
Szymon Starzycki
781f9fc4af
Revert "Revert "Fastbootd: flashing certification""
...
CMS functionality is now available
This reverts commit 068b71dd9c
.
Conflicts:
fastbootd/Android.mk
fastbootd/fastbootd.c
fastbootd/utils.c
fastbootd/utils.h
Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6
2013-10-02 18:24:58 -07:00
Christopher Ferris
4aef2e911e
am 7bdb7b42
: am 81890fd8
: am 5daba1e0
: Merge "Only build host library on linux-x86."
...
* commit '7bdb7b42224c6139c400eb47a5e9b660184aad54':
Only build host library on linux-x86.
2013-10-02 14:34:43 -07:00
Colin Cross
f7bc1702a6
am 903e6865
: am b024bbf6
: am 6da66ef4
: Merge "Handle screendumps for all framebuffer sizes"
...
* commit '903e6865cae15d5967c4c810ece17c021945c2e4':
Handle screendumps for all framebuffer sizes
2013-10-02 14:34:42 -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
6d22960759
Move cutils/log.h to log/log.h.
...
The log.h file moved, so clean up these references to the old
location.
Change-Id: I25494ea069bfb20fa07a02e67868c8be82e60161
2013-10-01 23:46:23 -07:00
Christopher Ferris
9043fc6696
am e6cfee1b
: am 0e9abad8
: am f3217de3
: Merge "Fix problems in libbacktrace."
...
* commit 'e6cfee1b91081ca12f1d8d66a639fce61d8dd18a':
Fix problems in libbacktrace.
2013-10-01 20:59:44 -07:00
Colin Cross
41c9fd6480
am 0d3ac55d
: am 230252d5
: am 61afb07b
: Merge "Trigger a policy reload from post-fs-data."
...
* commit '0d3ac55d0654fe4f6d37923782dcd41f0590c741':
Trigger a policy reload from post-fs-data.
2013-10-01 20:59:43 -07:00
William Luh
c123f3ac6a
am 9293ea4c
: am e3e22062
: Merge "Add new cert_pin_failure tag that can be used in user-consent filtering." into klp-dev
...
* commit '9293ea4c8650a2907772f684a7c9415f82414539':
Add new cert_pin_failure tag that can be used in user-consent filtering.
2013-10-01 20:58:22 -07: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