Marco Nelissen
592392f816
AI 146964: tabs -> spaces
...
Automated import of CL 146964
2013-07-30 13:56:49 -07:00
Mathias Agopian
544e3e3606
fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.
...
Squashed commit of the following:
commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 18:30:30 2009 -0700
fix and improve BufferMapper's tracking of mapped buffers.
commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 00:52:02 2009 -0700
fix some bugs with the Singleton<> class. untested.
commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date: Tue Apr 14 19:29:25 2009 -0700
some work to debug the Singleton<> template.
2013-07-30 13:56:49 -07:00
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
ae31e705de
auto import from //branches/cupcake/...@137873
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
Rebecca Schultz Zavin
3fec108e6c
Need to dup file descriptor when reading from the binder for native handles
...
When reading a native handle that has passed through the binder,
the fds have to be duped to prevent them from getting closed when the binder
object is destructed.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
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
Todd Poynor
13f4c9fb27
healthd: normal and charger mode startup
...
Command line flag -n tells healthd not to use (or wait for) servicemanager
in charger mode.
Change-Id: I255f9597dff6fc904f5ed20fd02f52c0531d14f8
2013-07-26 23:56:17 +00:00
Colin Cross
5ba57f9a95
Merge "add property to adjust extra_free_kbytes kernel vm tunable"
2013-07-26 23:07:00 +00: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
Todd Poynor
752faf2c18
healthd: Add system health monitoring daemon
...
Initially moving battery health monitoring here.
Command line flag -n tells healthd not to use (or wait for) servicemanager
in this execution, for charger and recovery modes.
Change-Id: I1720594724af0c068497b359f9c6ad65aeaa1519
2013-07-26 01:30:42 +00:00
Colin Cross
57fdb5cfd2
add property to adjust extra_free_kbytes kernel vm tunable
...
ActivityManager can't directly write to extra_free_kbytes because
/proc/sys rejects all chown and chmod syscalls. Proxy the writes
through init by using the sys.sysctl.extra_free_kbytes property.
Bug: 10024467
Change-Id: I441e00478421254355fcafb252bc878166483d4c
2013-07-25 18:22:30 -07:00
Mathias Agopian
8d9da28ab5
add sRGB pixel formats to the HALs
...
Change-Id: I1d5f9dd14a6485dd3a29fb5960edfa79aa86da42
2013-07-25 17:07:11 -07:00
Ying Wang
64f923ede0
Merge "Generate init.environ.rc by populating BOOTCLASSPATH"
2013-07-25 22:09:42 +00:00
Colin Cross
44f5c15724
Merge "Move liblog headers to system/core/include/log"
2013-07-25 21:39:24 +00:00
Elliott Hughes
b815810f47
am 09f240e0
: am 5d855432
: Merge "Add USB Vendor ID for ECS"
...
* commit '09f240e0b06326531e64e9826859a774cd456ad7':
Add USB Vendor ID for ECS
2013-07-25 09:58:12 -07:00
Elliott Hughes
09f240e0b0
am 5d855432
: Merge "Add USB Vendor ID for ECS"
...
* commit '5d8554323caddfa3ca02f31625ea72634312521f':
Add USB Vendor ID for ECS
2013-07-25 09:55:48 -07:00
Elliott Hughes
5d8554323c
Merge "Add USB Vendor ID for ECS"
2013-07-25 16:50:39 +00:00
Colin Cross
80292a7d75
Merge "fastbootd: userspace implementation of the fastboot device-side protocol"
2013-07-24 23:38:48 +00: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
Ying Wang
5748ee972d
Generate init.environ.rc by populating BOOTCLASSPATH
...
- BOOTCLASSPATH now is derived from PRODUCT_BOOT_JARS, which is a product
configuration variable set up by the core build system.
- Moved files from the legacy ALL_PREBUILT to PRODUCT_COPY_FILES in
build/target/product/embedded.mk.
Bug: 9990214
Change-Id: I98bac36c1ca8c779dda572a0a5e0a22b7e4c4a7a
2013-07-24 12:11:47 -07:00
Colin Cross
a3d386ea56
fastbootd: userspace implementation of the fastboot device-side protocol
...
Initial commit of fastbootd. A few commands work, but not
fully functional yet.
Change-Id: I589dee7b327b4460e94b4434aaf9bcf780faa839
2013-07-24 10:58:43 -07:00
Glenn Kasten
87bc464a9f
Merge "Valid channel mask must have at least one channel"
2013-07-24 15:49:13 +00:00
ecsgms
cae8b9df5c
Add USB Vendor ID for ECS
...
Change-Id: Ib2fa70204d37f53dc642091eb927d865ddc585b5
2013-07-24 16:13:49 +08: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
511f9efff7
Merge "cutils: add thread_defs header"
2013-07-24 00:37:28 +00: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
Colin Cross
776751ad79
am 8c4b1539
: am f9873987
: am 5954ecb8
: Merge "Allow more characters in partition name links"
...
* commit '8c4b153911e399f00fdf0ed4e39782d0d49396d6':
Allow more characters in partition name links
2013-07-22 15:45:42 -07:00
Colin Cross
8c4b153911
am f9873987
: am 5954ecb8
: Merge "Allow more characters in partition name links"
...
* commit 'f987398723b06538821162dadde7d7d2c9e0fb29':
Allow more characters in partition name links
2013-07-22 15:42:53 -07:00
Colin Cross
f987398723
am 5954ecb8
: Merge "Allow more characters in partition name links"
...
* commit '5954ecb87b8c77425d8cc766c0cc798957a07a7d':
Allow more characters in partition name links
2013-07-22 15:40:55 -07:00
Colin Cross
5954ecb87b
Merge "Allow more characters in partition name links"
2013-07-22 22:39:37 +00:00
The Android Open Source Project
70cdc26dfc
am ef6ef967
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1':
init: Increase maximum number of Android properties to 372
2013-07-22 08:01:59 -07:00
The Android Open Source Project
ef6ef9673d
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I686cdf493c592d52eb2718fa4e42f22b902dd84c
2013-07-22 07:59:25 -07:00
The Android Open Source Project
f1ae7bd998
am b441a2b9
: Merge 821678e1
...
* commit 'b441a2b930b5a85ea0189fbb99618823bf560037':
init: Increase maximum number of Android properties to 372
2013-07-22 07:58:31 -07:00
The Android Open Source Project
b441a2b930
Merge 821678e1
...
Change-Id: Ia6b827e03d8a62c4682e304a4f7f3b839c8cbbc3
2013-07-22 07:54:19 -07:00