Commit graph

13738 commits

Author SHA1 Message Date
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
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
08d719d25e am cced7693: am 5605c10a: am 101c57f7: Merge "Disable CR/LF translation for adb interactive shell."
* commit 'cced7693520d6376fe25fa4698c2b5ec7d6364a0':
  Disable CR/LF translation for adb interactive shell.
2015-04-05 22:45:58 +00:00
Elliott Hughes
cced769352 am 5605c10a: am 101c57f7: Merge "Disable CR/LF translation for adb interactive shell."
* commit '5605c10a87fe685329f971907699f5daa7b6861d':
  Disable CR/LF translation for adb interactive shell.
2015-04-05 17:22:15 +00: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
94a86a4f97 am 9dfd32ab: am d5fe0031: am 6d951c2c: Merge "Remove execonce."
* commit '9dfd32ab743bbc1b185a515c180fb63c26f53c16':
  Remove execonce.
2015-04-04 16:21:05 +00:00
Elliott Hughes
9dfd32ab74 am d5fe0031: am 6d951c2c: Merge "Remove execonce."
* commit 'd5fe0031f6e79383131be7f7a1b9fb46a51c248e':
  Remove execonce.
2015-04-04 15:59:33 +00: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
Rom Lemarchand
f396c9644b Merge "Move audio includes to system/media/audio" 2015-04-04 01:13:57 +00:00
Elliott Hughes
c5f37661f9 am 03c0adab: am 6a99ff0a: am 3a4aedfc: Merge "sdcard: Properly handle deleted nodes"
* commit '03c0adab88fcb91393f934f213f953c1f23762d5':
  sdcard: Properly handle deleted nodes
2015-04-04 01:06:09 +00:00
Elliott Hughes
03c0adab88 am 6a99ff0a: am 3a4aedfc: Merge "sdcard: Properly handle deleted nodes"
* commit '6a99ff0adfa8949cce11cd47142a3d550421904e':
  sdcard: Properly handle deleted nodes
2015-04-04 00:44:35 +00:00