Commit Graph

13032 Commits

Author SHA1 Message Date
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 5f6738af48 logcat: remove dead label code
Change-Id: I12d6aa4ebf48f06faf9435b4ffedfd309629cf3b
2015-03-04 13:21:42 -08:00
Mark Salyzyn 9421b0c060 logcat: do not stop on unexpected log ID
We are changing the log read API to allow event notification
regarding logging system data loss. We would like these out
of band events to be reported.

Change-Id: I9e802113604d8cc0fc9adff0d1e014bbc40914fe
2015-03-04 13:21:42 -08:00
Mark Salyzyn 29eb57066c logd: use <endian.h>
Change-Id: Iba843c054ea4fbe1a26c7821b5613fdb5e8001a1
2015-03-04 13:21:41 -08:00
Mark Salyzyn 4ed16b4381 Revert "logd: Add minimum time bucket statistics"
This forward port reverts
    commit e457b74ce6

No longer as necessary once we add
    liblog: Instrument logging of logd write drops
Although this provided an indication of how close statistically we
were to overloading logd it is simpler to understand fails thus to
hunt and peck a corrected value for /proc/sys/net/unix/max_dgram_qlen

Change-Id: I2b30e0fc30625a48fd11a12c2d2cc6a41f26226f
2015-03-04 13:21:41 -08:00
Mark Salyzyn d45d36e011 liblog: Instrument logging of logd write drops
- If logger system is prostrated, send an event message with the
  liblog tag from the associated UID and PID with a count of
  dropped messages once logging is resumed.
- Added to the README a description of the error return values.
- Describe in the README the appropriate mitigations for dropped
  messages.
- If the caller sees this message, then
  /proc/sys/net/unix/max_dgram_qlen is likely too small

Change-Id: Iaf387b9e5e1b6aa93bebc7481f9e8353732e3229
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
Eino-Ville Talvala 03743414cb Add ANativeWindow dataSpace; update graphics formats, color spaces
First stage of adding a new dataSpace field for ANativeWindow,
for communicating format- (and endpoint-) dependent information
about graphics buffers. For most formats, dataSpace describes the
color space of the buffer, while format describes the memory layout.

For some formats, the dataSpace may also specify that the buffer
contains depth measurements, encoded images, or other kinds of
information that is not necessarily a simple 2D image.
Rename the existing colorspace enumeration to dataspace, with an added
dataspace for depth, and sRGB gamma-corrected and linear colorspaces.

Add in a definition for Android depth point clouds as a
variable-length list of float-triplet coordinates, as the underlying
layout of buffers with format HAL_PIXEL_FORMAT_BLOB and dataSpace of
HAL_DATASPACE_DEPTH.

Also remove now-unnecessary sRGB HAL graphics formats, and remove the
alias RAW_SENSOR that was left in to ease transition to RAW16.

Change-Id: I8797f67fb9c2b18da5975f2145303ca0bf98e62d
2015-03-04 11:59:51 -08:00
Erik Kline 314d82c3c5 Make sure errmsg starts out null-terminated.
Also: clean up some stray trailing whitespace.

Change-Id: I12471b6059971c9c25d7ff6475bfad43cbee44f6
2015-03-04 17:15:28 +09: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
Erik Kline c2291a7ed3 Refactor dhcp_utils for more flexible uses.
Separate out fetching DHCP results from starting the daemon
(for either discover or renew).

Renamed dhcp_do_request() to dhcp_start().
Renamed dhcp_do_request_renew() to dhcp_start_renew().
Added new dhcp_get_results().

Callers of the prior versions of dhcp_do_request* now separately
call dhcp_get_results().

Bug: 19422416
Change-Id: I05447853d444015e6014661dda1bb177b58fe463
2015-03-02 12:26:53 +09: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
Mark Salyzyn ae19b63168 Merge "liblog: add pstore read" 2015-02-26 17:23:15 +00:00
Mark Salyzyn 7c975ac3a4 logcat: add pstore read
Used to pull the Android log messages after a reboot.
A companion to the pstore console logs. Adding the -L
flag triggers this behavior.

Change-Id: Icce2dc00bcbb26975bea604420c6be397869e804
2015-02-26 07:22:15 -08:00
Mark Salyzyn 6eef417119 liblog: add pstore read
Used to pull the Android log messages after a reboot. Adding
an ANDROID_LOG_PSTORE flag to the mode parameter in calls to
android_logger_list_alloc() and android_logger_list_alloc_time().
The side effects are that android_logger_clear() and
android_logger_list_read() will react with the user space
pstore driver. Forms a companion to the pstore console logs.

Change-Id: I7bb07b87b3bf73f059a21af3f810af37c7715b6d
2015-02-26 06:37:35 -08:00
Nick Kralevich 5c09ad18dc am 3e8ebad0: am 3178c83a: am 895623e5: Merge "check if uid=0 before attempting remount"
* commit '3e8ebad058d584623c003c32895f0f9416cd36c3':
  check if uid=0 before attempting remount
2015-02-26 02:27:13 +00:00
Nick Kralevich be95a75e6f am 0a316829: am 398ade81: am 7bb72b73: Merge "seclabel use on services out of system partition"
* commit '0a316829fb856f98d8db3ba78667feb19fb12e22':
  seclabel use on services out of system partition
2015-02-26 02:27:11 +00:00
Elliott Hughes 8d82ea05cb Implement exec.
Change-Id: I20329bc9b378479d745b498d6a00eca0872cd5ab
2015-02-25 17:55:34 -08:00
Nick Kralevich 3e8ebad058 am 3178c83a: am 895623e5: Merge "check if uid=0 before attempting remount"
* commit '3178c83a02c7e0b1ee6f94c207f0d851f5baf7f2':
  check if uid=0 before attempting remount
2015-02-26 01:13:25 +00:00