Merge commit 'b752098e8d12d6e7925d97458078dbb896ca8a05' into eclair-plus-aosp
* commit 'b752098e8d12d6e7925d97458078dbb896ca8a05':
Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
Merge commit '33b69050b2074c1768c45895418f0454e52e279a' into eclair-plus-aosp
* commit '33b69050b2074c1768c45895418f0454e52e279a':
Add javadoc to explain which permissions are required for Public BT API's.
Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp
* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
Merge commit 'c3a30a00333910268e2b93c58f14214b074aa929' into eclair-plus-aosp
* commit 'c3a30a00333910268e2b93c58f14214b074aa929':
adding support for webkit plugins to use the java view system
Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp
* commit 'e05e02e17463616c885784a1f0e57eeb22b13f93':
Add basic metadata retrieval support for midi, ogg, etc.
Merge commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86' into eclair-plus-aosp
* commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86':
don't fling if there's nowhere to go
Merge commit 'f8d4964e45f7e671f4b333386b4269b23ced4750' into eclair-plus-aosp
* commit 'f8d4964e45f7e671f4b333386b4269b23ced4750':
default overview mode to false in webkit
Merge commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a' into eclair-plus-aosp
* commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a':
Revert "Adding classes to enable plugins to use the java view system."
Merge commit '67dffd93e045e08e446df11e370597a9463f010c' into eclair-plus-aosp
* commit '67dffd93e045e08e446df11e370597a9463f010c':
Adding classes to enable plugins to use the java view system.
Merge commit '7390c5af7a0c2379fa72218ea63a714f843edf0f' into eclair-plus-aosp
* commit '7390c5af7a0c2379fa72218ea63a714f843edf0f':
Fix small bugs in VCardComposer.java.
Merge commit 'eb034652c2037a47ebfd99779e8383bb8bb528af' into eclair-plus-aosp
* commit 'eb034652c2037a47ebfd99779e8383bb8bb528af':
Implement all of the infrastructure for configuring wallpapers.
Merge commit 'c916c04495292c86051a2c31e90cca26a9bd99c1' into eclair-plus-aosp
* commit 'c916c04495292c86051a2c31e90cca26a9bd99c1':
Fix issue #2095422: Some fades from opaque to transparent don't work
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp
* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
Open some methods on PrefereneManager to allow others use the inflater.
Merge commit '88e625795943dea84b2e7c32f37e71303143b728' into eclair-plus-aosp
* commit '88e625795943dea84b2e7c32f37e71303143b728':
Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
Rewrote SurfaceFlinger's buffer management from the ground-up.
The design now support an arbitrary number of buffers per surface, however the current implementation is limited to four. Currently only 2 buffers are used in practice.
The main new feature is to be able to dequeue all buffers at once (very important when there are only two).
A client can dequeue all buffers until there are none available, it can lock all buffers except the last one that is used for composition. The client will block then, until a new buffer is enqueued.
The current implementation requires that buffers are locked in the same order they are dequeued and enqueued in the same order they are locked. Only one buffer can be locked at a time.
eg. Allowed sequence: DQ, DQ, LOCK, Q, LOCK, Q
eg. Forbidden sequence: DQ, DQ, LOCK, LOCK, Q, Q
* changes:
Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler system property is set. Saves snapshots to the SD card.
Merge commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1' into eclair-plus-aosp
* commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1':
dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
Merge commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7' into eclair-plus-aosp
* commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7':
attempt to fix [2099362] Possible SurfaceFlinger crash
Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp
* commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a':
Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677' into eclair-plus-aosp
* commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677':
Minor perf improvement to fall and expand use of struct.
