Commit graph

705 commits

Author SHA1 Message Date
Mathias Agopian
cf89aa42ef fix KeyedVector::replaceValueAt, which wouldn't even compile if used. 2013-07-30 13:56:49 -07:00
Mathias Agopian
6b35f970ea Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2013-07-30 13:56:49 -07:00
The Android Open Source Project
4e3ea4acea auto import from //branches/cupcake_rel/...@140373 2013-07-30 13:56:49 -07:00
The Android Open Source Project
7a4c83922e auto import from //depot/cupcake/@136594 2013-07-30 13:56:49 -07:00
The Android Open Source Project
cbb1011c95 auto import from //depot/cupcake/@135843 2013-07-30 13:56:49 -07:00
The Android Open Source Project
cf59fa8dc7 auto import from //depot/cupcake/@135843 2013-07-30 13:56:49 -07:00
The Android Open Source Project
7aa707a5d6 auto import from //depot/cupcake/@132589 2013-07-30 13:56:49 -07:00
The Android Open Source Project
c739660fb7 auto import from //depot/cupcake/@137055 2013-07-30 13:56:49 -07:00
The Android Open Source Project
dccb00bd4c auto import from //branches/cupcake/...@131421 2013-07-30 13:56:49 -07:00
The Android Open Source Project
60dcc00861 auto import from //branches/cupcake/...@130745 2013-07-30 13:56:49 -07:00
ralf
13e4bed7db AAPT needs a buffer larger than 1 MB on the host to decode resources.arsc from SDK/android.jar.
This leaves the asset unzip buffer to 1 MB on the device and 2 MB on the host.
2013-07-30 13:56:49 -07:00
The Android Open Source Project
7976caad7d auto import from //branches/cupcake/...@127101 2013-07-30 13:56:49 -07:00
The Android Open Source Project
046e40caa0 auto import from //branches/cupcake/...@125939 2013-07-30 13:56:49 -07:00
The Android Open Source Project
7810449ca1 Code drop from //branches/cupcake/...@124589 2013-07-30 13:56:49 -07:00
The Android Open Source Project
d245d1d097 Initial Contribution 2013-07-30 13:56:46 -07:00
Mathias Agopian
6bac41f1bf get rid of HAL pixelformats 5551 and 4444
Change-Id: I047d948f2f3b5c681a0b187589775f92b4f01541
2013-07-26 14:50:26 -07:00
Mathias Agopian
224445c830 Merge "add sRGB pixel formats to the HALs" 2013-07-26 19:54:11 +00:00
Mathias Agopian
8d9da28ab5 add sRGB pixel formats to the HALs
Change-Id: I1d5f9dd14a6485dd3a29fb5960edfa79aa86da42
2013-07-25 17:07:11 -07:00
Colin Cross
9227bd3855 Move liblog headers to system/core/include/log
Move the liblog headers to log/ instead of cutils/ to complete
the separation of libcutils and liblog.  cutils/log.h still
exists and includes log/log.h in order to support the many existing
modules that use cutils/log.h.

Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
2013-07-24 12:32:39 -07:00
Glenn Kasten
87bc464a9f Merge "Valid channel mask must have at least one channel" 2013-07-24 15:49:13 +00:00
Alex Ray
000b1d0c50 thread_defs: remove trailing whitespace
Change-Id: Idba19c64dfde67c40a98c29f68d5e8d4e555a4cf
2013-07-23 22:20:45 -07:00
Colin Cross
42cf2b5945 fix windows build
thread_defs.h gets included by the windows host libandroidfw build,
which does not have sys/cdefs.h or BEGIN_DECLS.  Switch to using
extern "C" manually.

Change-Id: I363e6f2d3a64c5efeff54049a2e5dab080fd4715
2013-07-23 19:58:03 -07:00
Alex Ray
8a84c71acb cutils: add thread_defs header
Change-Id: I3b70054d9f9740a5980df514221de07df55e7176
2013-07-23 17:16:24 -07:00
Glenn Kasten
f7326dc0aa Valid channel mask must have at least one channel
Also:
 - Use correct type name audio_channel_mask_t
 - Use the parameter name 'channelMask' instead of the more ambiguous 'channels'

Change-Id: I22bc1821a1bded0e69fe7d99e7b981ff60d77cee
2013-07-23 16:47:17 -07:00
Richard Fitzgerald
05529a1a10 Add defines for audio offload and non-blocking write
- Defines audio output flags for offloaded playback of compressed
    streams, and non-blocking HAL write()/drain()
- Adds audio_offload_info_t to pass additional information about a
    compressed stream when offloading

Change-Id: I4592d0877edd39e68d0c1035d0652adbd397bf3a
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
2013-06-27 17:16:25 -07:00
Nick Kralevich
f5d79aa4bb Merge "Don't use __attribute__(__error__)" 2013-06-18 20:23:29 +00:00
Nick Kralevich
bda25e4ed5 Don't use __attribute__(__error__)
__attribute(__error__) isn't supported on clang, and generates
compiler warnings. Use __errordecl instead, which does the right thing
for different compilers.

Change-Id: Ifb0797a5de703cc5b3c39dcd97bcfaf404f1cafa
2013-06-18 12:14:47 -07:00
Tobias Grosser
9ede33233f Set ATRACE_ENABLE() to '0' if not availble
Change-Id: Iec61d275cd7b2be65f828c282f97cc59adf4cc0b
2013-06-17 18:38:02 -07:00
Dima Zavin
abb7d58010 HACK: cutils: restore record_stream temporarily
Restore the record_stream code in cutils that was removed
in e00a12bf8a as part of cutils
cleanup.

Unfortunately, there are some prebuilt vendor libs that rely on
this functionality that we cannot currently rebuild.

Remove at the earliest possible convenience once the vendor libs
have been fixed.

Bug: 9189218
Change-Id: I5d44126756f1e3ed194d1b5873d64d9154183199
Signed-off-by: Dima Zavin <dima@android.com>
2013-06-04 17:40:28 +00:00
Nick Kralevich
e44c6b7183 Merge "property_get: do argument checking." 2013-05-24 21:36:30 +00:00
Nick Kralevich
1c743de2bd Merge "properties.h: avoid duplicating constant values" 2013-05-24 21:36:22 +00:00
Tim Murray
d8b11c1ddd Add ATRACE_TAG_RS.
Change-Id: Iaff497a1cb04a797441b5bb47b30ad6f09db8e95
2013-05-23 13:46:12 -07:00
Nick Kralevich
0e54ec825e property_get: do argument checking.
Try to verify, at compile time, that the supplied
value buffer is large enough.

Change-Id: I91fa560d3ceff87609194269356ac634bdbf2ede
2013-05-23 11:05:16 -07:00
Nick Kralevich
53df3ade9b properties.h: avoid duplicating constant values
Use the constant value from sys/system_properties.h,
rather than having two copies of this constant in two
different places.

This partially addresses the TODO in the header file.

Change-Id: Ic0b098cb8caf562ed2a25a0cf8cd412ba2e06884
2013-05-23 11:05:16 -07:00
Brian Carlstrom
9186d85021 am a817ff9c: resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp
* commit 'a817ff9cf61daeb69e8b8382c80677e3e5c573a9':
  Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
  Add basic Darwin support to libcorkscrew.
2013-05-14 22:04:15 -07:00
Brian Carlstrom
a817ff9cf6 resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp
Change-Id: Idf344a1fc7e2f8ec76232ae14a00298ddd322a55
2013-05-14 21:59:53 -07:00
Elliott Hughes
89054056a7 Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
(If you fclose(3) rather than pclose(3) a FILE* you got from popen(3),
future popen(3)s fail obscurely, at least on Mac OS.)

(cherry picked from commit 2bf76e143da933184d1392fb9bea3a3896c37e76)

Change-Id: I5578fe06753061b0dbc5ee951ebf31eb2bab0389
2013-05-14 19:49:30 -07:00
Jamie Gennis
a0e780edd3 am 6e46a3b8: am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
* commit '6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b':
  libcutils: add a trace tag for Dalvik
2013-05-08 15:03:54 -07:00
Jamie Gennis
a1ee12ca3a Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev 2013-05-08 01:12:19 +00:00
Jamie Gennis
2b68e0675b libcutils: add a trace tag for Dalvik
This change adds a trace tag bit for Dalvik.  It also allows the ATRACE_*
macros to be called from code compiled for the host with no effect.

Bug: 8856374
Change-Id: I9c17129d6cc170cae00b6500485b5b5fa4b5e647
2013-05-07 15:19:34 -07:00
Dima Zavin
e00a12bf8a cutils: first pass at cleaning up legacy/obsolete code in cutils
Removed unused code and moved libraries with single clients
near their respective users.

Change-Id: I65f90f8659f27bd0f44ca5ddf33da2bce14674c1
Signed-off-by: Dima Zavin <dima@android.com>
2013-05-07 00:19:44 -07:00
Jeff Tinker
7629bf19a1 am 9e9ed1b4: am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev
* commit '9e9ed1b40010745e709157a6977ba6d053d46c49':
  Add a new group for MediaDrm engine plugins
2013-04-24 21:56:49 -07:00
Jeff Tinker
131ee07b77 Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev 2013-04-25 04:54:02 +00:00
Matthew Xie
af1cbd4c10 am 0db6600a: am 7ee2e26e: Remove DBUS from make and header files
* commit '0db6600a60e8d604aaef5e43db9ae52ed7380979':
  Remove DBUS from make and header files
2013-04-24 14:24:30 -07:00
Jeff Tinker
08d64308b9 Add a new group for MediaDrm engine plugins
bug: 8702754
Change-Id: I3b7988b64b1dcf4685624e4c1af938e132b82696
2013-04-23 19:54:17 -07:00
Matthew Xie
7ee2e26eb9 Remove DBUS from make and header files
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904

Change-Id: I3fa41c1dd4ac80bc679d5950b3b20c7f6d12265f
2013-04-23 14:02:16 -07:00
Nick Kralevich
ca8e66a8b0 Make init handle reboots
Move the responsibility for rebooting the system from the
reboot command to init. Init is in a better position to take
actions to bring the system down cleanly, including making sure
filesystems are mounted read-only.

The only UIDs which can perform an init triggered reboot are
root, system, and shell.

Modify the reboot command so that it calls into init to perform
the reboot. The reboot command no longer requires CAP_SYS_BOOT.

Remove the -n reboot option and code which supports it.  Anyone needing
to do an unclean shutdown can just do a 'echo c > /proc/sysrq-trigger'.

Modify adb so that it calls into init to perform a shutdown.

Bug: 8646621
Change-Id: I84c0513acb549720cb0e8c9fcbda0050f5c396f5
2013-04-23 13:21:40 -07:00
Alex Ray
4fcd7af279 am 3d35db33: am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev
* commit '3d35db33eb9e5b0769732d4baa43729fac50d467':
  graphics: add Android flexible YCbCr format
2013-04-18 13:45:13 -07:00
Alex Ray
ca0cb785cb Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev 2013-04-18 20:39:33 +00:00
Jamie Gennis
dcbe6b4b17 am b7b2c71b: am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev
* commit 'b7b2c71bf8bf685af4c716e78d5c70decab98b54':
  cutils: add a way to disable tracing for a process
2013-04-16 15:21:50 -07:00