Merge commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca' into gingerbread-plus-aosp
* commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca':
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be' into gingerbread-plus-aosp
* commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be':
docs: small edits to catchup to edits made in html pushed live
Merge commit '2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp
* commit '2bc481861ab374f87c12b7bb816ff75ac46147f1':
When filling the cache, we always time out waiting for a condition that won't occur.
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread
* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread
* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
docs: small edits to catchup to edits made in html pushed live
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into gingerbread
* commit '39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp
* commit 'e899caf8cce1d1a20121f19a99899553ae2b327e':
Fixed api/current.xml after a bad merge.
Merge commit '5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp
* commit '5c225b1680e696ae8bbf505a1997d6f720672f74':
Even more native input dispatch work in progress.
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.
Modified the internal representation of MotionEvent to be more
efficient and more consistent.
Added code to skip/cancel virtual key processing when there are multiple
pointers down. This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).
Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
Merge commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9' into gingerbread-plus-aosp
* commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9':
New API for "immersive" activity windows.
Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp
* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
New API for high-priority Notifications and full-screen alerts.
Merge commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17' into gingerbread-plus-aosp
* commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17':
TimedEventQueue is apparently important for glitch-free media playback, and so
Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp
* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread
* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread
* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp
* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp
* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
Remove hard-coded number of audio channels in AudioSource
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp
* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
Various improvements to battery stats collection
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit 'c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp
* commit '92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp
* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
add new video/audio presence icons in the framework resource dirs, and make them public.
