Andy Hung
4ff72b52a2
Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT
...
Should be Q8.23 (24 bits packed in the least significant
3 bytes).
Change-Id: If5ca27c27249487e28c0be42ebdd283308ff8552
2015-03-10 16:01:49 -07:00
Andreas Gampe
4234f6742a
am a7a045a5: am 8c2c089a: am 291ce5b8: Merge "Fs_mgr: Fix format code"
...
* commit 'a7a045a58605f18a7c1779061b5040c6c1bbc3e2':
Fs_mgr: Fix format code
2015-03-04 23:24:40 +00:00
Mark Salyzyn
ec3def70de
am 805bfea8: am 90446bf5: am eff8c801: Merge "logd: use <endian.h>"
...
* commit '805bfea89ac0b5064d2bf046df3a6400dbb517a3':
logd: use <endian.h>
2015-03-04 23:24:39 +00:00
Mark Salyzyn
ad966e88f5
am ddd1ea71: am e79201e4: am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
...
* commit 'ddd1ea71b4260981fb4814da4b6580c16bd8bb7f':
liblog: logprint use <endian.h>
private: Add event payload structures to android_logger.h
2015-03-04 23:24:38 +00:00
Sami Tolvanen
891ea4c05e
am 9c92cef4: am eb2ff9bb: am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
...
* commit '9c92cef4480cdb463605b4ab39fbaeb586659aba':
Add init support for dm-verity logging mode
2015-03-04 23:24:37 +00:00
Sami Tolvanen
c1dadc6327
am 1ae4f750: am 6904e0c2: am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
...
* commit '1ae4f7507241d1754a4806f3151c385d909343cd':
Add fs_mgr support for dm-verity modes
2015-03-04 23:24:36 +00:00
Andreas Gampe
a7a045a586
am 8c2c089a: am 291ce5b8: Merge "Fs_mgr: Fix format code"
...
* commit '8c2c089ae2b9e07131e4125da9c44387954d04f5':
Fs_mgr: Fix format code
2015-03-04 22:51:35 +00:00
Mark Salyzyn
805bfea89a
am 90446bf5: am eff8c801: Merge "logd: use <endian.h>"
...
* commit '90446bf5b80048454786b69cf3bec6186abdd370':
logd: use <endian.h>
2015-03-04 22:51:34 +00:00
Mark Salyzyn
ddd1ea71b4
am e79201e4: am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
...
* commit 'e79201e4cb030e9df773ff535d34e12c8b3c8624':
liblog: logprint use <endian.h>
private: Add event payload structures to android_logger.h
2015-03-04 22:51:33 +00:00
Sami Tolvanen
9c92cef448
am eb2ff9bb: am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
...
* commit 'eb2ff9bb1b92feed65a610564569ddae525c3517':
Add init support for dm-verity logging mode
2015-03-04 22:51:32 +00:00
Sami Tolvanen
1ae4f75072
am 6904e0c2: am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
...
* commit '6904e0c263a02f08c9c6f555dceafa2cce467954':
Add fs_mgr support for dm-verity modes
2015-03-04 22:51:31 +00:00
Andreas Gampe
8c2c089ae2
am 291ce5b8: Merge "Fs_mgr: Fix format code"
...
* commit '291ce5b82d8a504be69132f1827e20041833c488':
Fs_mgr: Fix format code
2015-03-04 22:44:44 +00:00
Mark Salyzyn
90446bf5b8
am eff8c801: Merge "logd: use <endian.h>"
...
* commit 'eff8c801fd0d9016ee039ca15e295c5a8056cc96':
logd: use <endian.h>
2015-03-04 22:44:42 +00:00
Mark Salyzyn
e79201e4cb
am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
...
* commit '4487c605eaeea2b85c8511fe915a286c3aaf4da4':
liblog: logprint use <endian.h>
private: Add event payload structures to android_logger.h
2015-03-04 22:44:41 +00:00
Sami Tolvanen
eb2ff9bb1b
am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
...
* commit '8ee42f9c50086830edb2cdf035ad5bedcf0fa6f1':
Add init support for dm-verity logging mode
2015-03-04 22:44:38 +00:00
Sami Tolvanen
6904e0c263
am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
...
* commit 'a88fb24ab43eec9710a0d4d15aedb6d4bc51a2ec':
Add fs_mgr support for dm-verity modes
2015-03-04 22:44:37 +00:00
Andreas Gampe
291ce5b82d
Merge "Fs_mgr: Fix format code"
2015-03-04 22:03:35 +00:00
Mark Salyzyn
eff8c801fd
Merge "logd: use <endian.h>"
2015-03-04 21:38:19 +00:00
Andreas Gampe
eb69e85768
Fs_mgr: Fix format code
...
Suggested printing for off_t is to cast to intmax_t and print that.
Follow-up to https://android-review.googlesource.com/133111 .
Change-Id: Icff6844044c3d0fa6372c3f399453a526fd89954
2015-03-04 13:29:12 -08:00
Mark Salyzyn
29eb57066c
logd: use <endian.h>
...
Change-Id: Iba843c054ea4fbe1a26c7821b5613fdb5e8001a1
2015-03-04 13:21:41 -08:00
Mark Salyzyn
4487c605ea
Merge changes I0ec0fe3e,I9e5fccba
...
* changes:
liblog: logprint use <endian.h>
private: Add event payload structures to android_logger.h
2015-03-04 21:21:13 +00:00
Mark Salyzyn
66bfc5ccbd
liblog: logprint use <endian.h>
...
Change-Id: I0ec0fe3e954f6f04964d58e57c817d28057b630b
2015-03-04 12:48:04 -08:00
Mark Salyzyn
fa1c063feb
private: Add event payload structures to android_logger.h
...
- common android_event_header_t
- android_event_int_t ANDROID_TYPE_INT payload
- android_log_event_int_t single ANDROID_TYPE_INT event
- android_event_long_t ANDROID_TYPE_LONG payload
- android_log_event_long_t single ANDROID_TYPE_LONG event
- android_event_string_t ANDROID_TYPE_STRING payload
- android_log_event_string_t single ANDROID_TYPE_STRING event
Change-Id: I9e5fccba38e3f230c2c4ec7dec51ed110c460f95
2015-03-04 12:48:04 -08:00
Sami Tolvanen
8ee42f9c50
Merge "Add init support for dm-verity logging mode"
2015-03-04 20:42:09 +00:00
Sami Tolvanen
a88fb24ab4
Merge "Add fs_mgr support for dm-verity modes"
2015-03-04 20:41:49 +00:00
Sami Tolvanen
8ff0190835
Add init support for dm-verity logging mode
...
Add a built-in command for loading verity state. If dm-verity
will be started in logging mode, trigger verity-logging.
Needs changes from
Ibb82953594d234f81ad21c40f524190b88e4ac8f
Change-Id: I5af4918f2f14fdd4d07f51c55837e08111fd3748
2015-03-04 03:07:47 +00:00
Sami Tolvanen
51bf11ad95
Add fs_mgr support for dm-verity modes
...
Add support for dm-verity modes and storing persistent state in
a location specified by the following properties:
ro.verity.state.location
ro.verity.state.offset
If these properties do not exist, dm-verity is always loaded in
EIO mode. If the properties do exist, but the location does not
have valid state data, dm-verity is loaded in RESTART mode. The
mode is updated to LOGGING if a dm-verity triggered restart has
occurred.
Change-Id: Ibb82953594d234f81ad21c40f524190b88e4ac8f
2015-03-04 03:07:35 +00:00
Rom Lemarchand
38b340a52f
Remove /proc/cpuinfo parsing
...
- Clean up the paths for ro.revision and ro.hardware parsing
- Use ro.hardwre in ueventd instead of parsing the kernel command line
Bug: 19366018
Change-Id: I018a293f3d46e736a8b65132b5b00b0f7c20edae
2015-02-27 19:09:59 -08:00
Sami Tolvanen
73bb196e35
am 3aa700e6: am 622d44d8: am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
...
* commit '3aa700e6857566290fdf42265091de9eb872ce35':
Set underlying block device RO when enabling verity
2015-02-28 00:57:04 +00:00
Sami Tolvanen
3aa700e685
am 622d44d8: am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
...
* commit '622d44d86481295660534cd06a8b5914466acf29':
Set underlying block device RO when enabling verity
2015-02-28 00:50:42 +00:00
Sami Tolvanen
622d44d864
am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
...
* commit 'fbb3f8ca499b04c82437155f87c8666cad607c6b':
Set underlying block device RO when enabling verity
2015-02-28 00:43:58 +00:00
Sami Tolvanen
fbb3f8ca49
Merge "Set underlying block device RO when enabling verity"
2015-02-28 00:40:11 +00:00
Nick Kralevich
8e6aea5c72
am 2f54e05b: am 5e14f416: am 6864e673: Merge "More SOCK_CLOEXEC"
...
* commit '2f54e05b36d0049b2db8694df978e9948444f7b1':
More SOCK_CLOEXEC
2015-02-27 23:31:07 +00:00
Nick Kralevich
2f54e05b36
am 5e14f416: am 6864e673: Merge "More SOCK_CLOEXEC"
...
* commit '5e14f416afa412e49ebb07239e6e570c9405518d':
More SOCK_CLOEXEC
2015-02-27 23:24:23 +00:00
Nick Kralevich
5e14f416af
am 6864e673: Merge "More SOCK_CLOEXEC"
...
* commit '6864e6739027adf725ced33777d3e21f80a95479':
More SOCK_CLOEXEC
2015-02-27 23:19:11 +00:00
Nick Kralevich
6864e67390
Merge "More SOCK_CLOEXEC"
2015-02-27 21:44:36 +00:00
Mark Salyzyn
87946e714b
am 20dc9c01: am 1dd71ae1: am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
...
* commit '20dc9c01fabb33ed5a0e17b8efbdcdbe576c0941':
init: drop dontpanic & apanic initialization
2015-02-27 19:44:46 +00:00
Mark Salyzyn
20dc9c01fa
am 1dd71ae1: am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
...
* commit '1dd71ae12e2e47c9ca63eb04878ee9632cc4417c':
init: drop dontpanic & apanic initialization
2015-02-27 19:39:44 +00:00
Mark Salyzyn
1dd71ae12e
am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
...
* commit 'f33c3bc9602e4a369c4cc5d28357b8f73a3eed6c':
init: drop dontpanic & apanic initialization
2015-02-27 19:34:33 +00:00
Mark Salyzyn
f33c3bc960
Merge "init: drop dontpanic & apanic initialization"
2015-02-27 19:28:52 +00:00
Mark Salyzyn
1eaba37aae
init: drop dontpanic & apanic initialization
...
Bug: 19050686
Bug: 19525200
Change-Id: Id81abe3b44283b439390b42db7a9da23748dee0a
2015-02-27 07:03:01 -08:00
Sami Tolvanen
214f33b8c0
Set underlying block device RO when enabling verity
...
Currently, when verity is set up on a block device, the underlying
device is still accessible directly. Change the existing function
fs_set_blk_ro visible to other fs_mgr modules, change the behavior
to match the comment above the function definition, and call it to
disable write access to the block device when setting up verity.
Bug: 18609347
Change-Id: I7884175df15f9161174788d74d20a08e4cd472ca
2015-02-27 11:28:34 +00:00
Nick Kralevich
6d3cddb2e2
More SOCK_CLOEXEC
...
Change-Id: I3e18f34d08a6443aaf55d7c91c27867840ac1773
2015-02-26 13:32:52 -08:00
Mark Salyzyn
e6b0512efa
am 68440e0d: am b8d1af61: am be971215: Merge "logcat: add pstore read"
...
* commit '68440e0dfeb47dd2bb9f4b51f67d5176ed120e20':
logcat: add pstore read
2015-02-26 17:42:33 +00:00
Mark Salyzyn
75a2283d6b
am 8c52e3b7: am d851c80f: am ae19b631: Merge "liblog: add pstore read"
...
* commit '8c52e3b79f8ca9ccef5d562f16a0c275f58b8538':
liblog: add pstore read
2015-02-26 17:42:31 +00:00
Mark Salyzyn
68440e0dfe
am b8d1af61: am be971215: Merge "logcat: add pstore read"
...
* commit 'b8d1af618d9b8486765933bda03f2e80c1166491':
logcat: add pstore read
2015-02-26 17:35:43 +00:00
Mark Salyzyn
8c52e3b79f
am d851c80f: am ae19b631: Merge "liblog: add pstore read"
...
* commit 'd851c80f0d99387c52725e019b20de727ca385d8':
liblog: add pstore read
2015-02-26 17:35:42 +00:00
Mark Salyzyn
b8d1af618d
am be971215: Merge "logcat: add pstore read"
...
* commit 'be9712156bdcf8cff774a78a3afdb0c562998c73':
logcat: add pstore read
2015-02-26 17:29:06 +00:00
Mark Salyzyn
d851c80f0d
am ae19b631: Merge "liblog: add pstore read"
...
* commit 'ae19b63168d1b958898180979156e2a4169ee4c2':
liblog: add pstore read
2015-02-26 17:29:05 +00:00
Mark Salyzyn
be9712156b
Merge "logcat: add pstore read"
2015-02-26 17:23:24 +00:00