Mark Salyzyn
9e750a42b0
liblog: Add kernel log id
...
(cherry pick from commit 440e109d64
)
Change-Id: I53002f05a8bdf8d67e1d761c56c8761d3b534a76
2015-05-13 09:22:41 -07:00
Christopher Ferris
af67fb2475
Add offset to map data.
...
Also, print the offset in the maps section.
Bug: 20864928
Change-Id: I71f005726e5ef73cf75bbcb8f829fd5127cb9d61
(cherry picked from commit 5c8856854d
)
2015-05-06 16:35:50 -07:00
Christopher Ferris
329ed7dae4
Add load base to map for relocation packing.
...
The new linker relocation packing support uses non-zero load bases,
so we better handle them properly.
Also print out the load base for a map if it's non-zero.
Bug: 20687795
Change-Id: Iec2d1db2051e7b4a278c1dfa57d745128a7f2974
2015-05-01 16:04:24 -07:00
Mike Lockwood
f68600abfc
libusbhost: Add usb_device_get_version()
...
Change-Id: If2161178e9fe94a94faf01c102ef64f2a72d093b
2015-04-29 13:04:10 -07:00
Jeff Brown
28e84a147f
Merge "Add float support to binary event log." into mnc-dev
2015-04-29 01:18:09 +00:00
Jeff Brown
b1993b637f
Add float support to binary event log.
...
Bug: 20664753
Change-Id: Ib4752bd785496dab5bb4d4979d5d80f662adbdfa
2015-04-28 17:52:37 -07:00
Dan Stoza
0a866ea450
ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query
...
Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the
contents of the most recently dequeued buffer as the number of frames
that have elapsed since it was last queued.
Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23
(cherry picked from commit 19df32cd19
)
2015-04-28 13:42:30 -07:00
Lajos Molnar
90686d8e97
Merge "media: reserve color formats used by flex-YUV422/444 and RGB/A888"
2015-04-24 23:54:48 +00:00
Lajos Molnar
e632c1bf0c
media: reserve color formats used by flex-YUV422/444 and RGB/A888
...
These are used by Image when MediaCodec produces a non-surface
higher-resolution YUV image, or codec-specific ordered RGB/A image
Change-Id: Ie5cd8236586b375cbc707d45584bd35415c274fc
2015-04-24 23:43:57 +00:00
John Reck
52fc3e9aa8
Move LinearAlloc to libhwui
...
Change-Id: I83a70959ed0dcab2237faaf1dddc02b5eb0363c9
2015-04-23 15:07:54 -07:00
Richard Uhler
e7eba774d8
am b1e5d2e3: am 68f3a5a0: am f75f16a1: Merge "Fix typos in comments"
...
* commit 'b1e5d2e386d2738ce9415d349f2a71945830d0a6':
Fix typos in comments
2015-04-22 16:54:35 +00:00
Richard Uhler
f75f16a1dd
Merge "Fix typos in comments"
2015-04-22 16:07:22 +00:00
Michael Wright
835d9ca034
am 97147ef2: am a7d47092: am a75b3de2: Merge "Mark time conversion functions as constexpr"
...
* commit '97147ef2cd09bef1f348375611905864fa0fd068':
Mark time conversion functions as constexpr
2015-04-21 23:27:12 +00:00
Elliott Hughes
65aae74b3a
am 9ab15f2f: am 39ce837d: am 9f2944aa: Merge "Remove dead code."
...
* commit '9ab15f2fd98b052be50045d5f88b4ee5dfbda413':
Remove dead code.
2015-04-21 23:27:06 +00:00
Michael Wright
a75b3de2c2
Merge "Mark time conversion functions as constexpr"
2015-04-21 21:50:28 +00:00
Elliott Hughes
d5ff3e9449
Remove dead code.
...
We weren't even building this.
Change-Id: I8b2afbc76d784a7b24bbe0be6502b9fbcf0b5c09
2015-04-21 12:24:50 -07:00
Elliott Hughes
72e9ff084b
am de165446: am 09495b7f: am eb7d308a: Merge "Remove a declaration for an unimplemented function."
...
* commit 'de165446ede9f663b24a2aeec91c34a6758db1ad':
Remove a declaration for an unimplemented function.
2015-04-21 05:26:49 +00:00
Elliott Hughes
e886ba9c4e
Remove a declaration for an unimplemented function.
...
Change-Id: I890cef52e9a8c26d98f227f269a7dcfcb6eaa795
2015-04-20 20:55:43 -07:00
Richard Uhler
587fb6a091
Fix typos in comments
...
Change-Id: Ia06ae6bec66e140fb302c650f7d62304864ca840
2015-04-20 10:10:33 -07:00
Michael Wright
65e93c3b6f
Mark time conversion functions as constexpr
...
Change-Id: I753c6975a8e1d78978c31175b2e1868eb374c442
2015-04-20 15:06:01 +01:00
Greg Hackmann
7364f24d7e
am 4601fbb8: am ec682735: am 0e2d6015: Merge "Revert "cutils: add OS-independent endian.h""
...
* commit '4601fbb8190723be24aab787ee62c2fc29523e30':
Revert "cutils: add OS-independent endian.h"
2015-04-16 22:09:01 +00:00
Greg Hackmann
0e2d6015bc
Merge "Revert "cutils: add OS-independent endian.h""
2015-04-16 21:29:44 +00:00
Greg Hackmann
bf7f28a415
Revert "cutils: add OS-independent endian.h"
...
This reverts commit c3bac8b671
.
2015-04-16 14:28:58 -07:00
Greg Hackmann
dd27606bce
am 618c2edb: am 47578c68: am 88e03449: Merge "cutils: add OS-independent endian.h"
...
* commit '618c2edba1a4723e2673d09615a03368a43c9568':
cutils: add OS-independent endian.h
2015-04-16 20:43:21 +00:00
Greg Hackmann
88e03449de
Merge "cutils: add OS-independent endian.h"
2015-04-16 20:06:40 +00:00
Yabin Cui
0801196c09
am 5808b357: am 972a8de7: am 51e32b52: Merge "Move trace.h to stdatomic."
...
* commit '5808b3578aa871f7cf4eac3dda93604f9a014e50':
Move trace.h to stdatomic.
2015-04-16 19:19:02 +00:00
Yabin Cui
51e32b52a3
Merge "Move trace.h to stdatomic."
2015-04-16 18:35:43 +00:00
Greg Hackmann
c3bac8b671
cutils: add OS-independent endian.h
...
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>
2015-04-16 11:12:02 -07:00
Yabin Cui
a8ac32c781
Move trace.h to stdatomic.
...
Bug: 20262261
Change-Id: Idaf984786804eb76c285f38b11abbbc0d3706509
2015-04-16 10:41:16 -07:00
Mark Salyzyn
233b4974df
am c130d96e: am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"
...
* commit 'c130d96e9cf786d17196a400a07fb4e6e221a07c':
libcutils: add fs_config_generate
2015-04-16 00:32:33 +00:00
Mark Salyzyn
5d9e5efbcd
libcutils: add fs_config_generate
...
Bug: 19908228
Change-Id: Icb0e189a86758bb779b9bdf7c0d92216d297869f
2015-04-15 16:43:07 -07:00
Dan Stoza
3c4074bfb4
am a197c3b7: am 3ec9c17f: am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
...
* commit 'a197c3b74b50bbdf88a9214269e29db7286338c1':
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:29:57 +00:00
Dan Stoza
238ec985f9
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
...
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
2015-04-15 12:49:41 -07:00
Mark Salyzyn
247d5521a9
am 9301f216: am 8f6dfc7d: am e65c2210: Merge "log: Add check for LINT_RLOG"
...
* commit '9301f2167897d5954880d038fa6e63e03bf547f4':
log: Add check for LINT_RLOG
2015-04-10 19:56:34 +00:00
Mark Salyzyn
4ff2545525
log: Add check for LINT_RLOG
...
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
2015-04-10 11:28:16 -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
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
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
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
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
a21c29ee81
android_filesystem_config: move fs_config to libcutils
...
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 10:04:16 -07:00
Rom Lemarchand
f396c9644b
Merge "Move audio includes to system/media/audio"
2015-04-04 01:13:57 +00:00
Rom Lemarchand
be7aca60f3
Move audio includes to system/media/audio
...
Change-Id: I21bed541dbd81127e6b8340f7f14b5523f7c5c0d
2015-04-03 15:12:01 -07:00
Elliott Hughes
3bb04bd804
am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."
...
* commit '6c7c6d0420ca837b81927b2f7c08cd9d92533043':
Only Windows doesn't have %zd.
2015-04-03 20:58:29 +00:00
Elliott Hughes
7c1945254e
am ea975880: Merge "Only Windows doesn\'t have %zd."
...
* commit 'ea975880112c27293800ede36e0323ff2a7b9322':
Only Windows doesn't have %zd.
2015-04-03 20:30:46 +00:00
Elliott Hughes
146c244613
Only Windows doesn't have %zd.
...
Change-Id: Ie09619df212cf7c8aa18a6d46c3e6b6ca3f478cf
2015-04-03 12:53:36 -07:00
Elliott Hughes
16bcaac5fd
am cd868370: am b2c3473d: am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
...
* commit 'cd8683709c2d1bcac7e3b9de827a2dfc8f24bf09':
Just use snprintf for android_get_control_socket.
2015-04-03 14:53:01 +00:00
Elliott Hughes
bbc6e1bf86
am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
...
* commit 'b45733319dc269375d599da894eecd2ffa4211ff':
Be more intention-revealing with libcutils' strlcpy.
2015-04-03 14:52:33 +00:00
Elliott Hughes
b2c3473d35
am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
...
* commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614':
Just use snprintf for android_get_control_socket.
2015-04-03 03:45:30 +00:00