summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am de165446: am 09495b7f: am eb7d308a: Merge "Remove a declaration for an ↵Elliott Hughes2015-04-211-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | unimplemented function." * commit 'de165446ede9f663b24a2aeec91c34a6758db1ad': Remove a declaration for an unimplemented function.
| * | | Remove a declaration for an unimplemented function.Elliott Hughes2015-04-201-1/+0
| |/ / | | | | | | | | | Change-Id: I890cef52e9a8c26d98f227f269a7dcfcb6eaa795
* | | am 4601fbb8: am ec682735: am 0e2d6015: Merge "Revert "cutils: add ↵Greg Hackmann2015-04-161-52/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | OS-independent endian.h"" * commit '4601fbb8190723be24aab787ee62c2fc29523e30': Revert "cutils: add OS-independent endian.h"
| * | Merge "Revert "cutils: add OS-independent endian.h""Greg Hackmann2015-04-161-52/+0
| |\ \
| | * | Revert "cutils: add OS-independent endian.h"Greg Hackmann2015-04-161-52/+0
| | | | | | | | | | | | | | | | This reverts commit c3bac8b6719332f31140b2a034b70cf7f9eb3e51.
* | | | am 618c2edb: am 47578c68: am 88e03449: Merge "cutils: add OS-independent ↵Greg Hackmann2015-04-161-0/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | endian.h" * commit '618c2edba1a4723e2673d09615a03368a43c9568': cutils: add OS-independent endian.h
| * | | Merge "cutils: add OS-independent endian.h"Greg Hackmann2015-04-161-0/+52
| |\ \ \ | | |/ /
| | * | cutils: add OS-independent endian.hGreg Hackmann2015-04-161-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cutils/endian.h provides the helpers defined in endian(3), either by pulling in the OS's built-in endian.h (where available) or recreating them using GCC builtins. Change-Id: Ic8965f67e1efdc03f884dbe6b7fe0276f840e4fc Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am 5808b357: am 972a8de7: am 51e32b52: Merge "Move trace.h to stdatomic."Yabin Cui2015-04-161-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5808b3578aa871f7cf4eac3dda93604f9a014e50': Move trace.h to stdatomic.
| * | | Merge "Move trace.h to stdatomic."Yabin Cui2015-04-161-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Move trace.h to stdatomic.Yabin Cui2015-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 20262261 Change-Id: Idaf984786804eb76c285f38b11abbbc0d3706509
* | | | am c130d96e: am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"Mark Salyzyn2015-04-161-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c130d96e9cf786d17196a400a07fb4e6e221a07c': libcutils: add fs_config_generate
| * | | libcutils: add fs_config_generateMark Salyzyn2015-04-151-0/+2
| |/ / | | | | | | | | | | | | Bug: 19908228 Change-Id: Icb0e189a86758bb779b9bdf7c0d92216d297869f
* | | am a197c3b7: am 3ec9c17f: am 04274a29: Merge "Add ↵Dan Stoza2015-04-151-24/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | NATIVE_WINDOW_SET_SURFACE_DAMAGE" * commit 'a197c3b74b50bbdf88a9214269e29db7286338c1': Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
| * | Add NATIVE_WINDOW_SET_SURFACE_DAMAGEDan Stoza2015-04-151-24/+30
| |/ | | | | | | | | | | | | | | | | | | Adds a new perform action: NATIVE_SET_WINDOW_SURFACE_DAMAGE, which allows the producer to describe the region of the surface that has changed since the previous frame. Bug: 11239309 Change-Id: Ie645e6a52b37b5c1b3be19481e8348570d1aa62c
* | am 9301f216: am 8f6dfc7d: am e65c2210: Merge "log: Add check for LINT_RLOG"Mark Salyzyn2015-04-101-4/+23
|\ \ | |/ | | | | | | * commit '9301f2167897d5954880d038fa6e63e03bf547f4': log: Add check for LINT_RLOG
| * log: Add check for LINT_RLOGMark Salyzyn2015-04-101-4/+23
| | | | | | | | | | | | | | | | | | | | In order to make it easier to find radio system logging mistakes, if LINT_RLOG is defined we will remove all the definitions for ALOG* and SLOG*, as well as the log ids to introduce compile and link errors. Bug: 20143912 Change-Id: I1511bdce75213f3a5bacdbc4f2ab315aa1fa56fc
* | am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible ↵Nick Kralevich2015-04-071-2/+14
|\ \ | |/ | | | | | | | | | | array member within another struct" * commit 'f09bfa3c14c8b5a920a98c1327c0d42f9ef9e2ca': logd: Don't embed a flexible array member within another struct
| * logd: Don't embed a flexible array member within another structNick Kralevich2015-04-071-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
| * android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLSMark Salyzyn2015-04-061-6/+3
| | | | | | | | Change-Id: Idb050b9ef4e7947664295b173e1b09d65accd3e9
| * 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
| * android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-061-109/+27
| | | | | | | | | | Bug: 19908228 Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
* | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-061-110/+27
| | | | | | | | | | Bug: 19908228 Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
* | Merge "Move audio includes to system/media/audio"Rom Lemarchand2015-04-043-1706/+0
|\ \
| * | Move audio includes to system/media/audioRom Lemarchand2015-04-033-1706/+0
| | | | | | | | | | | | Change-Id: I21bed541dbd81127e6b8340f7f14b5523f7c5c0d
* | | am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-031-5/+5
|\ \ \ | |/ / |/| | | | | | | | * commit '6c7c6d0420ca837b81927b2f7c08cd9d92533043': Only Windows doesn't have %zd.
| * | am ea975880: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-031-5/+5
| |\ \ | | |/ | | | | | | | | | * commit 'ea975880112c27293800ede36e0323ff2a7b9322': Only Windows doesn't have %zd.
| | * Only Windows doesn't have %zd.Elliott Hughes2015-04-031-5/+5
| | | | | | | | | | | | Change-Id: Ie09619df212cf7c8aa18a6d46c3e6b6ca3f478cf
* | | am cd868370: am b2c3473d: am 70df6f85: Merge "Just use snprintf for ↵Elliott Hughes2015-04-031-19/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | android_get_control_socket." * commit 'cd8683709c2d1bcac7e3b9de827a2dfc8f24bf09': Just use snprintf for android_get_control_socket.
| * | am 70df6f85: Merge "Just use snprintf for android_get_control_socket."Elliott Hughes2015-04-031-19/+9
| |\ \ | | |/ | | | | | | | | | * commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614': Just use snprintf for android_get_control_socket.
| | * Just use snprintf for android_get_control_socket.Elliott Hughes2015-04-021-19/+9
| | | | | | | | | | | | Change-Id: I3d0da03847f79c9f9b2cfd7189a07f63b17fc4a2
* | | am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing ↵Elliott Hughes2015-04-031-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | with libcutils\' strlcpy." * commit 'b45733319dc269375d599da894eecd2ffa4211ff': Be more intention-revealing with libcutils' strlcpy.
| * | am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."Elliott Hughes2015-04-021-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '4c1d4a0e8ec344799813ce5e6642946839e0036a': Be more intention-revealing with libcutils' strlcpy.
| | * Be more intention-revealing with libcutils' strlcpy.Elliott Hughes2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | Several people have been independently confused about when this gets built and why over the past couple of days. Change-Id: I2d4a02f66e24c0734327585b7d27e50a344b1e94
* | | Merge "audio.h: add AUDIO_FORMAT_DTS"Phil Burk2015-04-021-0/+5
|\ \ \
| * | | audio.h: add AUDIO_FORMAT_DTSPhil Burk2015-04-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18292317 Change-Id: Icb3855e958d02e3b03517ac0fcf7de743d896c12 Signed-off-by: Phil Burk <philburk@google.com>
* | | | am 797b246f: am a1f69f18: am 21593186: Merge "Move all libcutils tests into ↵Elliott Hughes2015-04-021-0/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | the gtests." * commit '797b246ff374e0fc3066a45545b8156f50f23267': Move all libcutils tests into the gtests.
| * | | am 21593186: Merge "Move all libcutils tests into the gtests."Elliott Hughes2015-04-021-0/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '2159318647b6032a9d752012b923c579dc1f80da': Move all libcutils tests into the gtests.
| | * | Move all libcutils tests into the gtests.Elliott Hughes2015-04-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the bug where we were always testing against the fake strlcpy we provide for glibc/Windows rather than the Android one. This also removes some unnecessary library dependencies. This also builds all the cutils tests for the host (static and dynamic). Change-Id: Icd129d5b025c0ca801be5acf31a54ecd88608df9
* | | | am 88defca0: am b3b1757f: am 0c266ef2: Merge "Define atrace_* functions for ↵Richard Uhler2015-04-011-14/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | both target and host." * commit '88defca0f5ee64143a83021e637b53908ed109ed': Define atrace_* functions for both target and host.
| * | | am 0c266ef2: Merge "Define atrace_* functions for both target and host."Richard Uhler2015-04-011-14/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0c266ef2d7e137efbd83366a98a861d9770fbf06': Define atrace_* functions for both target and host.
| | * | Merge "Define atrace_* functions for both target and host."Richard Uhler2015-04-011-14/+0
| | |\ \
| | | * | Define atrace_* functions for both target and host.Richard Uhler2015-03-271-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines atrace_* functions for the host that act as no-ops, which makes it easier to add tracing in ART. Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
* | | | | am 22790dfc: am 246e9d50: am 9dc41d5d: Merge "Refactor the code."Christopher Ferris2015-03-311-12/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '22790dfcfceebc537ffd3eb0a15fc0512f036091': Refactor the code.
| * | | | am 9dc41d5d: Merge "Refactor the code."Christopher Ferris2015-03-311-12/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd': Refactor the code.
| | * | | Merge "Refactor the code."Christopher Ferris2015-03-311-12/+9
| | |\ \ \
| | | * | | Refactor the code.Christopher Ferris2015-03-311-12/+9
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The object hierarchy was confusing and convoluted. This removes a lot of unnecessary code, and consolidates the BacktraceCurrent and BacktraceThread code into BacktraceCurrent. Change-Id: I01c8407d493712a48169df49dd3ff46db4a7c3ae
* | | | | Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Tim Kilbourn2015-03-312-1/+4
|\ \ \ \ \
| * | | | | Allow inputflinger to have CAP_BLOCK_SUSPEND.Tim Kilbourn2015-03-252-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606