Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp
* commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587':
Separate MediaRecorderClient with MediaPlayerClient
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp
* commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33':
new presence icons for video/audio chats.
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp
* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
Unhide new API for supporting multiple cameras.
Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp
* commit '41debbc613ec57aa892f604229df376402942687':
Provide progress status report during authoring
Merge commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b' into gingerbread-plus-aosp
* commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b':
Placeholder icons for the "ringing" variant of stat_sys_phone_call.
Merge commit '1cb3fdc91e1b82a5afe064714a1b530cc05577a7' into gingerbread-plus-aosp
* commit '1cb3fdc91e1b82a5afe064714a1b530cc05577a7':
Fix a bug in sp<> and wp<> which could cause memory corruptions
Merge commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5' into gingerbread-plus-aosp
* commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5':
Various fixes and improvements in audio effects implementation
Merge commit '330dd304a471d260a73e342a240921c03c825f99' into gingerbread-plus-aosp
* commit '330dd304a471d260a73e342a240921c03c825f99':
Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h
Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory
Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance
Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
Merge commit '357f8209f3aec63fa2779da4eeab8825f80b0a41' into gingerbread-plus-aosp
* commit '357f8209f3aec63fa2779da4eeab8825f80b0a41':
Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
Merge commit '6feaa46496bae85adbe10e84611592612f898081' into gingerbread-plus-aosp
* commit '6feaa46496bae85adbe10e84611592612f898081':
Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp
* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
Track maximum amplitude and fix getMaxAmplitude()
when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.
This bug would cause linked-list of smart-pointers to fail
miserably.
Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp
* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.
Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp
* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
Updated StatusBar test app for new notifications API.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp
* commit '87160757e827e8e158d233de09d70e7128184729':
Basic handling of Notifications with fullScreenIntent.
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp
* commit '7dacda1142379df1f1f9854c24e452acdea98436':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp
* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
Fix the notification vibration setting and add a test app that lets you recover from the busted
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp
* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
Make bad notifications crash their application.
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token