Commit Graph

13908 Commits

Author SHA1 Message Date
Nick Kralevich 5056cdcdde am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server"
* commit '01190672d2194eefc24eade30c74b6d653578545':
  Create /data/system/heapdump for system_server
2015-04-08 00:43:30 +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 136a790a3a am 1fb919a3: am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."
* commit '1fb919a358436905133f3d4819f8ee5f38395cc7':
  Lose restorecon to toybox.
2015-04-07 23:18:47 +00:00
Elliott Hughes 1fb919a358 am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."
* commit '55f49af66d73f8c6b25b8bd9bca73972449a48be':
  Lose restorecon to toybox.
2015-04-07 23:03:19 +00: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 1268f227ee am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit 'f09bfa3c14c8b5a920a98c1327c0d42f9ef9e2ca':
  logd: Don't embed a flexible array member within another struct
2015-04-07 18:44:07 +00:00
Nick Kralevich f09bfa3c14 am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit '25482963840feae9f82e553fb69508aa8698b6bb':
  logd: Don't embed a flexible array member within another struct
2015-04-07 18:07:24 +00: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 a90dd16565 am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"
* commit '13e8af053b425b66199dc12b89c02236b517fac9':
  Restore verity state when verified partition is reflashed
2015-04-07 10:02:27 +00:00
Sami Tolvanen 856006047b am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value"
* commit '93c4b6c85ac4350029e1a78c16663f61c777ac14':
  Set verity mode as the verified property value
2015-04-07 10:02:26 +00:00
Sami Tolvanen 13e8af053b am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"
* commit 'b6b66f8fde39ce004fa9db5d9f88f21a2b7bedd0':
  Restore verity state when verified partition is reflashed
2015-04-07 09:42:32 +00:00
Sami Tolvanen 93c4b6c85a am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value"
* commit 'ddaebb24f34a83adfc812bf196c5c633633993fa':
  Set verity mode as the verified property value
2015-04-07 09:42:30 +00: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
Jeff Sharkey b52af94a73 Merge "Mount point for expanded storage." 2015-04-07 04:24:09 +00:00
Jeff Sharkey ae0a5acc0e Mount point for expanded storage.
Managed by vold.

Bug: 19993667
Change-Id: I7957b44d37d6a1f572cbec515d03856a8ed54391
2015-04-06 17:42:14 -07:00
Mark Salyzyn b885106dc7 am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
* commit '2904e949bb872051618c323c74fcb0e93f67ed09':
  android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
2015-04-06 23:28:48 +00:00
Eino-Ville Talvala ebdc0464dd am 772b9003: (-s ours) DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
* commit '772b90032ec380deabaea0bde69ecb1cc3cfc6d1':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
2015-04-06 23:27:50 +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 2904e949bb am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
* commit '0bce68b421a65daf212c3f17834912830fb418b4':
  android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
2015-04-06 22:54:31 +00: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 3fe36779ef android_filesystem_config: move fs_config to libcutils
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 15:04:05 -07: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
Eino-Ville Talvala 772b90032e 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)
(cherry picked from commit b2edfa514e)
2015-04-06 18:43:41 +00:00
Dan Stoza 3490a395da am 6e233ae8: (-s ours) am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master
* commit '6e233ae84667c938ea1162c6dd3a3f92a5b78f2b':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
2015-04-06 18:40:29 +00:00
Mark Salyzyn b61fd61912 am 835a04c8: am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."
* commit '835a04c8527c90b0c00a2c52f67488946912c82e':
  Allow inputflinger to have CAP_BLOCK_SUSPEND.
2015-04-06 18:40:28 +00:00
Dan Stoza 6e233ae846 am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master
* commit 'dcc7aadb96e3c408d301377827de24f5f9bfe63f':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
2015-04-06 18:19:36 +00:00
Mark Salyzyn 835a04c852 am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."
* commit '5b16ceaf886e9c6d75f1122e3b53213652199c37':
  Allow inputflinger to have CAP_BLOCK_SUSPEND.
2015-04-06 18:19:35 +00:00
Mark Salyzyn e3ab499356 am 8bd4bee8: (-s ours) am fb3c6ac0: am b137dab4: Merge "android_filesystem_config: move fs_config to libcutils"
* commit '8bd4bee8397bd077ae94561fa491350f569ec6b3':
  android_filesystem_config: move fs_config to libcutils
2015-04-06 18:17:20 +00: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 f6ab534588 am 698198d0: am 8797b7a1: am d42df562: Merge "libcutils: add fs_config"
* commit '698198d09a0b56d74bf5185c1cf970a8e59ff49f':
  libcutils: add fs_config
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
Dan Albert 131bef55d1 am a47d32c6: am 68c384fd: am d1e90c01: Merge "Cleanup base/logging."
* commit 'a47d32c67209d43ad3ceac91dfcb4d4a15ec6185':
  Cleanup base/logging.
2015-04-06 17:58:41 +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
Mark Salyzyn 8bd4bee839 am fb3c6ac0: am b137dab4: Merge "android_filesystem_config: move fs_config to libcutils"
* commit 'fb3c6ac05446c3cdb18ce5e565f0284a5e91e441':
  android_filesystem_config: move fs_config to libcutils
2015-04-06 17:48:55 +00:00
Mark Salyzyn 698198d09a am 8797b7a1: am d42df562: Merge "libcutils: add fs_config"
* commit '8797b7a1145eb72490a692a8dd73cc7d956d2b49':
  libcutils: add fs_config
2015-04-06 17:48:53 +00: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
Dan Albert a47d32c672 am 68c384fd: am d1e90c01: Merge "Cleanup base/logging."
* commit '68c384fd4f4cd2185d46bd762b81fbbe0b82a0c1':
  Cleanup base/logging.
2015-04-06 17:38:30 +00: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