summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5056cdcd: am 01190672: am de957955: Merge "Create /data/system/heapdump ↵Nick Kralevich2015-04-081-0/+1
|\ | | | | | | | | | | | | for system_server" * commit '5056cdcdde4901fe667522cfebf3e1f9e1af3b3b': Create /data/system/heapdump for system_server
| * am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server"Nick Kralevich2015-04-081-0/+1
| |\ | | | | | | | | | | | | * commit '01190672d2194eefc24eade30c74b6d653578545': Create /data/system/heapdump for system_server
| | * am de957955: Merge "Create /data/system/heapdump for system_server"Nick Kralevich2015-04-081-0/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'de957955522cdb433e3615abe2022afd180c4e49': Create /data/system/heapdump for system_server
| | | * Merge "Create /data/system/heapdump for system_server"Nick Kralevich2015-04-081-0/+1
| | | |\
| | | | * Create /data/system/heapdump for system_serverNick Kralevich2015-04-071-0/+1
| | | |/ | | | | | | | | | | | | | | | | Bug: 20073185 Change-Id: I6fd83d33da33d048fdd6b07fa1f675ecb4f4eb2c
* | | | am 1fb919a3: am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1fb919a358436905133f3d4819f8ee5f38395cc7': Lose restorecon to toybox.
| * | | am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '55f49af66d73f8c6b25b8bd9bca73972449a48be': Lose restorecon to toybox.
| | * | am 5ae7b1e5: Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '5ae7b1e5dfc1b3612fb3a894b9e01aed4624a602': Lose restorecon to toybox.
| | | * Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
| | | |\
| | | | * Lose restorecon to toybox.Elliott Hughes2015-04-072-64/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I5460f46700011b7733a1d87a9049e828531627be
* | | | | am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible ↵Nick Kralevich2015-04-072-5/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | array member within another struct" * commit 'f09bfa3c14c8b5a920a98c1327c0d42f9ef9e2ca': logd: Don't embed a flexible array member within another struct
| * | | | am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member ↵Nick Kralevich2015-04-072-5/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | within another struct" * commit '25482963840feae9f82e553fb69508aa8698b6bb': logd: Don't embed a flexible array member within another struct
| | * | | am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within ↵Nick Kralevich2015-04-072-5/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | another struct" * commit '5fc47aae333520787d4373bc615a8ddcf58955ae': logd: Don't embed a flexible array member within another struct
| | | * | Merge "logd: Don't embed a flexible array member within another struct"Nick Kralevich2015-04-072-5/+17
| | | |\ \ | | | | |/ | | | |/|
| | | | * logd: Don't embed a flexible array member within another structNick Kralevich2015-04-072-5/+17
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when ↵Sami Tolvanen2015-04-071-20/+117
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | verified partition is reflashed" * commit '13e8af053b425b66199dc12b89c02236b517fac9': Restore verity state when verified partition is reflashed
| * | | am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified ↵Sami Tolvanen2015-04-071-20/+117
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | partition is reflashed" * commit 'b6b66f8fde39ce004fa9db5d9f88f21a2b7bedd0': Restore verity state when verified partition is reflashed
| | * | am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '02f1d80ae2da2436c4c2e2a4643866871f41d54f': Restore verity state when verified partition is reflashed
| | | * Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
| | | |\
| | | | * Restore verity state when verified partition is reflashedSami Tolvanen2015-03-311-20/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store verity state separately for each verified partition, and store a hash of the last verity table signature for each partition. If the signature changes, assume the partition has been reflashed and reset verity state. Bug: 20006638 Change-Id: I1c85fb816bfec1a54b1033c938bf1fdaf572f849
* | | | | am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the ↵Sami Tolvanen2015-04-074-37/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | verified property value" * commit '93c4b6c85ac4350029e1a78c16663f61c777ac14': Set verity mode as the verified property value
| * | | | am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ddaebb24f34a83adfc812bf196c5c633633993fa': Set verity mode as the verified property value
| | * | | am 284c5cb2: Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '284c5cb2a16d21e5d5123ae6a0d731dcc6beadca': Set verity mode as the verified property value
| | | * | Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
| | | |\ \ | | | | |/
| | | | * Set verity mode as the verified property valueSami Tolvanen2015-03-314-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the verity mode as the value for partition.%s.verified to make it easier for userspace to determine in which mode dm-verity was started. Change-Id: Icc635515f8a8ede941277aed196867351d8387cb
* | | | | Merge "Mount point for expanded storage."Jeff Sharkey2015-04-071-0/+1
|\ \ \ \ \
| * | | | | Mount point for expanded storage.Jeff Sharkey2015-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Managed by vold. Bug: 19993667 Change-Id: I7957b44d37d6a1f572cbec515d03856a8ed54391
* | | | | | am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: ↵Mark Salyzyn2015-04-061-6/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | use __BEGIN_DECLS and __END_DECLS" * commit '2904e949bb872051618c323c74fcb0e93f67ed09': android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
| * | | | | am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use ↵Mark Salyzyn2015-04-061-6/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | __BEGIN_DECLS and __END_DECLS" * commit '0bce68b421a65daf212c3f17834912830fb418b4': android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
| | * | | | am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and ↵Mark Salyzyn2015-04-061-6/+3
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | __END_DECLS" * commit '33c2ad37cac1d85272bd0f8f869710cac73d3bb7': android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
| | | * | | Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"Mark Salyzyn2015-04-061-6/+3
| | | |\ \ \
| | | | * | | android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLSMark Salyzyn2015-04-061-6/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: Idb050b9ef4e7947664295b173e1b09d65accd3e9
* | | | | | am 772b9003: (-s ours) DO NOT MERGE Add ANativeWindow dataSpace; update ↵Eino-Ville Talvala2015-04-060-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | graphics formats, color spaces * commit '772b90032ec380deabaea0bde69ecb1cc3cfc6d1': DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
| * | | | | DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-04-062-38/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 b93343d199f7a09a1c7f0af440a2d8c35001ddba) (cherry picked from commit b2edfa514e5feffc734eb8d2f694359c34977b74)
* | | | | | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-062-121/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19908228 Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
* | | | | | am 6e233ae8: (-s ours) am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ↵Dan Stoza2015-04-060-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master * commit '6e233ae84667c938ea1162c6dd3a3f92a5b78f2b': DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
| * | | | | am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; ↵Dan Stoza2015-04-060-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update graphics formats, color spaces" into stage-aosp-master * commit 'dcc7aadb96e3c408d301377827de24f5f9bfe63f': DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
| | * | | | Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, ↵Dan Stoza2015-04-062-38/+201
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | color spaces" into stage-aosp-master
| | | * | | | DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-04-062-38/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 b93343d199f7a09a1c7f0af440a2d8c35001ddba)
* | | | | | | am 835a04c8: am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have ↵Mark Salyzyn2015-04-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CAP_BLOCK_SUSPEND." * commit '835a04c8527c90b0c00a2c52f67488946912c82e': Allow inputflinger to have CAP_BLOCK_SUSPEND.
| * | | | | | am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5b16ceaf886e9c6d75f1122e3b53213652199c37': Allow inputflinger to have CAP_BLOCK_SUSPEND.
| | * | | | | am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '08fe38e23bad476be9dd46bf45ece1b5f3700178': Allow inputflinger to have CAP_BLOCK_SUSPEND.
| | | * | | | Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
| | | |\ \ \ \
| | | | * | | | Allow inputflinger to have CAP_BLOCK_SUSPEND.Tim Kilbourn2015-04-061-1/+3
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry picked from commit 83e6f2606b9c3488454a7bb01c7341fb43b59ac7) Resolved conflict in include/private/android_filesystem_config.h, content already in libcutils/fs_config.c. Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606
* | | | | | | am 8bd4bee8: (-s ours) am fb3c6ac0: am b137dab4: Merge ↵Mark Salyzyn2015-04-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "android_filesystem_config: move fs_config to libcutils" * commit '8bd4bee8397bd077ae94561fa491350f569ec6b3': android_filesystem_config: move fs_config to libcutils
| * | | | | | am fb3c6ac0: am b137dab4: Merge "android_filesystem_config: move fs_config ↵Mark Salyzyn2015-04-062-120/+27
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to libcutils" * commit 'fb3c6ac05446c3cdb18ce5e565f0284a5e91e441': android_filesystem_config: move fs_config to libcutils
| | * | | | | am b137dab4: Merge "android_filesystem_config: move fs_config to libcutils"Mark Salyzyn2015-04-062-120/+27
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b137dab48c26c7aedfe2ec753d2e600a6a122a74': android_filesystem_config: move fs_config to libcutils
| | | * | | | Merge "android_filesystem_config: move fs_config to libcutils"Mark Salyzyn2015-04-062-120/+27
| | | |\ \ \ \
| | | | * | | | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-062-120/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19908228 Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
* | | | | | | | am 698198d0: am 8797b7a1: am d42df562: Merge "libcutils: add fs_config"Mark Salyzyn2015-04-062-0/+146
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '698198d09a0b56d74bf5185c1cf970a8e59ff49f': libcutils: add fs_config
generated by cgit v1.1 at 2025-01-11 06:39:27 +0000