Commit graph

12569 commits

Author SHA1 Message Date
Mohamad Ayyash
d71eca9e09 am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs""
* commit 'e322ae1996fd52e1c4d8fdbe29f4631d4bd936a3':
  Revert "fs_mgr_verity: Add support for squashfs"
2015-04-08 19:40:44 +00:00
Mohamad Ayyash
e322ae1996 Merge "Revert "fs_mgr_verity: Add support for squashfs"" 2015-04-08 19:34:10 +00:00
Mohamad Ayyash
7b97c7a3fa Revert "fs_mgr_verity: Add support for squashfs"
This reverts commit 807f47004f.

Change-Id: I2d7972c0828c842b44747dd08fbe44668f2a55db
2015-04-08 19:31:00 +00:00
Mohamad Ayyash
48bfdb859b am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"
* commit '70f81ceeeb1c88a164b0e02e05110043ceef8885':
  fs_mgr_verity: Add support for squashfs
2015-04-08 19:09:55 +00:00
Mohamad Ayyash
70f81ceeeb Merge "fs_mgr_verity: Add support for squashfs" 2015-04-08 19:02:11 +00:00
Elliott Hughes
6e73780b9e am 74a18757: Merge "Lose getprop to toybox."
* commit '74a1875766a0f41dd67cb8825ae671fd5b343f12':
  Lose getprop to toybox.
2015-04-08 18:11:29 +00:00
Elliott Hughes
74a1875766 Merge "Lose getprop to toybox." 2015-04-08 17:54:59 +00:00
Mark Salyzyn
07e3ed462f am c19572fa: Merge "rootfs: init start logd in post-fs"
* commit 'c19572fa809c87623f1e720ea5596b01bca9f3ed':
  rootfs: init start logd in post-fs
2015-04-08 16:39:23 +00:00
Mark Salyzyn
c19572fa80 Merge "rootfs: init start logd in post-fs" 2015-04-08 16:32:39 +00:00
Mark Salyzyn
124ff15bca rootfs: init start logd in post-fs
The earliest point we can start logd is after /system is mounted.
Ideally on post-fs-system (does not exist), post-fs will do.
As insurance, we will also make sure logd is started if a
logd-reinit is requested. This results in logd starting at least
4 processes earlier than it does currently, with a tighter
grouping of threads which means we are taking advantage of a
lighter CPU load at the time, rather than taking cycles during
heavy activity during core startup.

Change-Id: If4f0bd3a53bb4c47500a54d741ca635d87c0c330
2015-04-08 09:18:50 -07:00
Elliott Hughes
5b50fc3d3a Lose getprop to toybox.
Change-Id: I5188dbcc7e248b2fabade2d8d137610b4adb3164
2015-04-07 22:32:49 -07:00
Elliott Hughes
6994d3fa7a am bf403968: Merge "Lose setprop to toybox."
* commit 'bf403968878fca07c6df98852e8958ddda365bab':
  Lose setprop to toybox.
2015-04-08 03:33:45 +00:00
Elliott Hughes
bf40396887 Merge "Lose setprop to toybox." 2015-04-08 03:27:20 +00:00
Nick Kralevich
01190672d2 am de957955: Merge "Create /data/system/heapdump for system_server"
* commit 'de957955522cdb433e3615abe2022afd180c4e49':
  Create /data/system/heapdump for system_server
2015-04-08 00:33:47 +00:00
Nick Kralevich
de95795552 Merge "Create /data/system/heapdump for system_server" 2015-04-08 00:07:20 +00:00
Nick Kralevich
9c0437fba7 Create /data/system/heapdump for system_server
Bug: 20073185
Change-Id: I6fd83d33da33d048fdd6b07fa1f675ecb4f4eb2c
2015-04-07 16:44:43 -07:00
Elliott Hughes
3da8e5ea97 Lose setprop to toybox.
Change-Id: Ic0fd9cfb70e117067f4ebc5e120dea4b5fe1d883
2015-04-07 15:59:07 -07:00
Elliott Hughes
55f49af66d am 5ae7b1e5: Merge "Lose restorecon to toybox."
* commit '5ae7b1e5dfc1b3612fb3a894b9e01aed4624a602':
  Lose restorecon to toybox.
2015-04-07 22:52:38 +00:00
Elliott Hughes
5ae7b1e5df Merge "Lose restorecon to toybox." 2015-04-07 22:42:20 +00:00
Elliott Hughes
877dfc2896 Lose restorecon to toybox.
Change-Id: I5460f46700011b7733a1d87a9049e828531627be
2015-04-07 14:45:07 -07:00
Nick Kralevich
2548296384 am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit '5fc47aae333520787d4373bc615a8ddcf58955ae':
  logd: Don't embed a flexible array member within another struct
2015-04-07 17:56:42 +00:00
Nick Kralevich
5fc47aae33 Merge "logd: Don't embed a flexible array member within another struct" 2015-04-07 17:46:23 +00:00
Nick Kralevich
58ba58a97c logd: Don't embed a flexible array member within another struct
C (but not C++) has a concept of a flexible array member, which
is documented at https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html .
Using a flexible array member indicates that the structure is
really a header for a variable length object.

In logd's case, the variable length structure android_event_string_t
was embedded within another structure called
android_log_event_string_t. This makes gcc's __builtin_object_size()
function really confused. When compiling with C++,
__builtin_object_size(android_log_event_string_t.payload.data, 1)
would return 0, whereas if you compiled the code with C, the same
call would (properly) return -1.

Code which does automatic bounds checking, such as the proposed
patch at https://android-review.googlesource.com/145411 , will
cause problems for logd if this syntax is used.

Don't try to embed a variable length structure within another
structure. This doesn't appear to be valid C nor C++, and
while it's worked, it seems problematic.

Instead, inline the structure so it's one big happy structure.

Change-Id: I8ac02b7142a4f6560f5f80df2effcf720f9896fc
2015-04-07 10:12:20 -07:00
Sami Tolvanen
b6b66f8fde am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"
* commit '02f1d80ae2da2436c4c2e2a4643866871f41d54f':
  Restore verity state when verified partition is reflashed
2015-04-07 09:31:41 +00:00
Sami Tolvanen
ddaebb24f3 am 284c5cb2: Merge "Set verity mode as the verified property value"
* commit '284c5cb2a16d21e5d5123ae6a0d731dcc6beadca':
  Set verity mode as the verified property value
2015-04-07 09:31:39 +00:00
Sami Tolvanen
02f1d80ae2 Merge "Restore verity state when verified partition is reflashed" 2015-04-07 08:45:34 +00:00
Sami Tolvanen
284c5cb2a1 Merge "Set verity mode as the verified property value" 2015-04-07 08:45:24 +00:00
Mohamad Ayyash
807f47004f fs_mgr_verity: Add support for squashfs
- Cleanup the code to get filesystem size in a block device
- Add support to reading size of squashfs in a block device

Change-Id: I3848a705ed4dc2fc9afad20331f0fdecfee545c5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-04-06 16:20:26 -07:00
Mark Salyzyn
0bce68b421 am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
* commit '33c2ad37cac1d85272bd0f8f869710cac73d3bb7':
  android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
2015-04-06 22:43:22 +00:00
Mark Salyzyn
33c2ad37ca Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS" 2015-04-06 22:37:55 +00:00
Mark Salyzyn
16045614fd android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
Change-Id: Idb050b9ef4e7947664295b173e1b09d65accd3e9
2015-04-06 14:15:58 -07:00
Dan Stoza
dcc7aadb96 Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master 2015-04-06 18:09:56 +00:00
Mark Salyzyn
5b16ceaf88 am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."
* commit '08fe38e23bad476be9dd46bf45ece1b5f3700178':
  Allow inputflinger to have CAP_BLOCK_SUSPEND.
2015-04-06 18:08:28 +00:00
Mark Salyzyn
08fe38e23b Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." 2015-04-06 18:01:39 +00:00
Tim Kilbourn
628620c7ba Allow inputflinger to have CAP_BLOCK_SUSPEND.
(Cherry picked from commit 83e6f2606b)

Resolved conflict in include/private/android_filesystem_config.h, content
already in libcutils/fs_config.c.

Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606
2015-04-06 10:57:29 -07:00
Eino-Ville Talvala
b2edfa514e DO NOT MERGE 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.

Cherry pick of I8797f67fb9c2b18da5975f2145303ca0bf98e62d with the
following diff to maintain source compatibility:

@@ -58,6 +58,11 @@ enum {
     HAL_PIXEL_FORMAT_RGB_565            = 4,
     HAL_PIXEL_FORMAT_BGRA_8888          = 5,

+    // Deprecated sRGB formats for source code compatibility
+    // Not for use in new code
+    HAL_PIXEL_FORMAT_sRGB_A_8888        = 0xC,
+    HAL_PIXEL_FORMAT_sRGB_X_8888        = 0xD,
+
     /*
      * 0x100 - 0x1FF
      *
@@ -189,6 +194,9 @@ enum {
      */
     HAL_PIXEL_FORMAT_RAW16 = 0x20,

+    // Temporary alias for source code compatibility; do not use in new code
+    HAL_PIXEL_FORMAT_RAW_SENSOR = HAL_PIXEL_FORMAT_RAW16,
+
     /*
      * Android RAW10 format:
      *

Change-Id: I5c5ba98b297436f950e06a181eb0ff955747680f
(cherry picked from commit b93343d199)
2015-04-06 10:48:30 -07:00
Mark Salyzyn
fb3c6ac054 am b137dab4: Merge "android_filesystem_config: move fs_config to libcutils"
* commit 'b137dab48c26c7aedfe2ec753d2e600a6a122a74':
  android_filesystem_config: move fs_config to libcutils
2015-04-06 17:37:32 +00:00
Mark Salyzyn
8797b7a114 am d42df562: Merge "libcutils: add fs_config"
* commit 'd42df562413c75fd7cd5b8a1d920bde8a3c22735':
  libcutils: add fs_config
2015-04-06 17:37:31 +00:00
Mark Salyzyn
b137dab48c Merge "android_filesystem_config: move fs_config to libcutils" 2015-04-06 17:33:47 +00:00
Mark Salyzyn
d42df56241 Merge "libcutils: add fs_config" 2015-04-06 17:30:59 +00:00
Dan Albert
68c384fd4f am d1e90c01: Merge "Cleanup base/logging."
* commit 'd1e90c01f6409cd3babd2c38154aebf9272cd825':
  Cleanup base/logging.
2015-04-06 17:28:02 +00:00
Dan Albert
d1e90c01f6 Merge "Cleanup base/logging." 2015-04-06 17:20:13 +00:00
Mark Salyzyn
a21c29ee81 android_filesystem_config: move fs_config to libcutils
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 10:04:16 -07:00
Mark Salyzyn
8b2c7dee59 libcutils: add fs_config
Bug: 19908228
Change-Id: I78e6a8d780e578a287ffdee7b7120ecc74797e80
2015-04-06 10:04:15 -07:00
Elliott Hughes
5605c10a87 am 101c57f7: Merge "Disable CR/LF translation for adb interactive shell."
* commit '101c57f71b401a5b35fd5f7117949cc03760e16d':
  Disable CR/LF translation for adb interactive shell.
2015-04-05 17:11:46 +00:00
Elliott Hughes
101c57f71b Merge "Disable CR/LF translation for adb interactive shell." 2015-04-05 17:03:38 +00:00
Alistair Buxton
dfa09fd635 Disable CR/LF translation for adb interactive shell.
adb shell uses termios to disable canonical input processing in order to
get raw control codes but it does not disable CR/LF translation. The default
for Linux terminals is to convert CR to LF unless the running program
specifically asks for this to be disabled. Since adb does not, there is no
way to send a CR to any program run on adb shell. Many programs do in fact
differentiate and so are broken by this behaviour, notably nano. This patch
sets the termios flags to disable all line ending translation.

Change-Id: I8b950220f7cc52fefaed2ee37d97e0789b40a078
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
2015-04-05 10:02:34 -07:00
Elliott Hughes
d5fe0031f6 am 6d951c2c: Merge "Remove execonce."
* commit '6d951c2c3fd4af4459d86ce81068e01873aa2ea8':
  Remove execonce.
2015-04-04 15:49:59 +00:00
Elliott Hughes
6d951c2c3f Merge "Remove execonce." 2015-04-04 15:42:04 +00:00
Elliott Hughes
6a99ff0adf am 3a4aedfc: Merge "sdcard: Properly handle deleted nodes"
* commit '3a4aedfcd3354b903aa48a836cb55ee01db9f896':
  sdcard: Properly handle deleted nodes
2015-04-04 00:34:42 +00:00