Ed Heyl
8d16ac26f3
am 536dea9d
: am 169c12b5
: merge in klp-release (no-op)
...
* commit '536dea9d61a032e64bbe584a97463c6638ead009':
2013-10-16 18:13:01 -07:00
Ed Heyl
536dea9d61
am 169c12b5
: merge in klp-release (no-op)
...
* commit '169c12b5cf55d9574f98935d5517d20f55f62be8':
2013-10-16 18:07:31 -07:00
Ed Heyl
169c12b5cf
merge in klp-release (no-op)
2013-10-16 17:48:19 -07:00
Marcin Chojnacki
50dc936964
init: remove obsolete rle logo
...
Obsolete RLE 565 logo is used nowhere,
because 565 framebuffer isn't used for years.
It's not necessary to keep this thing alive anymore.
Change-Id: Ie61e168790f791230530cd3eb1c68b1f7344c9a7
2013-10-16 17:39:16 +02:00
Nick Kralevich
3a5a7c0e26
am aa4051dc
: am 2f924ebe
: am a94d2b39
: Merge "Add a restorecon_recursive built-in command to init."
...
* commit 'aa4051dc4f90f987ba05269ce396d676571156e0':
Add a restorecon_recursive built-in command to init.
2013-10-10 12:42:49 -07:00
Nick Kralevich
aa4051dc4f
am 2f924ebe
: am a94d2b39
: Merge "Add a restorecon_recursive built-in command to init."
...
* commit '2f924ebe0b0891dba1996c246839427b23705018':
Add a restorecon_recursive built-in command to init.
2013-10-10 12:38:44 -07:00
Nick Kralevich
2f924ebe0b
am a94d2b39
: Merge "Add a restorecon_recursive built-in command to init."
...
* commit 'a94d2b392f830e3c0a1e4bd0d2d262314eada8d9':
Add a restorecon_recursive built-in command to init.
2013-10-10 12:37:05 -07:00
Nick Kralevich
a94d2b392f
Merge "Add a restorecon_recursive built-in command to init."
2013-10-10 19:34:18 +00:00
Kenny Root
df206c8e46
am 33d1e629
: am 4ff9c3f7
: am aab1670b
: Merge "Add support for ECDSA P-256 with SHA256"
...
* commit '33d1e6294f609c4f417905239bd5a086f3ef880f':
Add support for ECDSA P-256 with SHA256
2013-10-10 11:17:57 -07:00
Kenny Root
33d1e6294f
am 4ff9c3f7
: am aab1670b
: Merge "Add support for ECDSA P-256 with SHA256"
...
* commit '4ff9c3f7d89fe418290288d0925f257f0fe15f20':
Add support for ECDSA P-256 with SHA256
2013-10-10 11:14:49 -07:00
Kenny Root
4ff9c3f7d8
am aab1670b
: Merge "Add support for ECDSA P-256 with SHA256"
...
* commit 'aab1670b7071e90786c6a23d404cb03f3e316568':
Add support for ECDSA P-256 with SHA256
2013-10-10 11:11:50 -07:00
Stephen Smalley
726e8f7a8f
Add a restorecon_recursive built-in command to init.
...
Functionally equivalent to the restorecon -R toolbox command.
A use case is given by:
I48eaa2b9901ac8c978192c14493ba1058a089423
Also, fix error handling and documentation for restorecon command.
Change-Id: Ia7fbcc82645baf52c6bff0490d3492f458881cbb
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-10-10 14:09:19 -04:00
Kenny Root
aab1670b70
Merge "Add support for ECDSA P-256 with SHA256"
2013-10-10 18:07:20 +00:00
Elliott Hughes
cd8ab5e458
am 6891df7a
: am 45ddf184
: am 9b8a929d
: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."
...
* commit '6891df7a651a6f311121e119be7c69b1920ced14':
libcutils doesn't need to be looking at bionic's privates.
2013-10-10 10:46:10 -07:00
Elliott Hughes
17e8e6c69f
am 7f7b12b8
: am 5baecee3
: am be18538d
: Merge "Cleanup x86 flags and memset versions"
...
* commit '7f7b12b8ebba299868505984d6cf15b11f75aadf':
Cleanup x86 flags and memset versions
2013-10-10 10:46:10 -07:00
Elliott Hughes
6891df7a65
am 45ddf184
: am 9b8a929d
: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."
...
* commit '45ddf184960225862c6e178588034cce676683e3':
libcutils doesn't need to be looking at bionic's privates.
2013-10-10 10:40:11 -07:00
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
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