Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'
* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
Unhide new API for supporting multiple cameras.
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp
* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
Unhide new API for supporting multiple cameras.
Merge commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798'
* commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798':
Provide progress status report during authoring
Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp
* commit '41debbc613ec57aa892f604229df376402942687':
Provide progress status report during authoring
Merge commit 'a0a582355ba10454d2625ce2968015e50a12a3e3'
* commit 'a0a582355ba10454d2625ce2968015e50a12a3e3':
Placeholder icons for the "ringing" variant of stat_sys_phone_call.
Merge commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b' into gingerbread-plus-aosp
* commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b':
Placeholder icons for the "ringing" variant of stat_sys_phone_call.
Merge commit '687f8a2eb78c95bb9974951dbe38124f8543bacb'
* commit '687f8a2eb78c95bb9974951dbe38124f8543bacb':
Fix a bug in sp<> and wp<> which could cause memory corruptions
Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126'
* commit 'cdf1357b6e0152280dcd611b5f096db4887d8126':
Various fixes and improvements in audio effects implementation
Merge commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631'
* commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631':
Fixing counting the number of days in call log screen.
Merge commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b'
* commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b':
fillWindow's start position must be smaller than getCount value
Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c'
* commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c':
Change in media scanner to set correct date
Merge commit '75fb44b2344b900485aaf4506531010a8335b5a7'
* commit '75fb44b2344b900485aaf4506531010a8335b5a7':
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 '3b335078e8a6fe3e2045ad081785f139d5991786'
* commit '3b335078e8a6fe3e2045ad081785f139d5991786':
Fix that InputDeviceReaderThread that got killed during startup
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()
