OSDN Git Service
Glenn Kasten [Thu, 12 Jan 2012 20:27:51 +0000 (12:27 -0800)]
Use audio_format_t consistently, continued
Was int or uint32_t.
When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.
Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.
Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
Eino-Ville Talvala [Fri, 20 Jan 2012 22:32:22 +0000 (14:32 -0800)]
Merge "Add ANativeWindow timestamp support to camera service."
Andreas Huber [Fri, 20 Jan 2012 21:43:39 +0000 (13:43 -0800)]
Merge "Starhub RTSP apparently does not establish time on all tracks"
Andreas Huber [Fri, 20 Jan 2012 21:30:03 +0000 (13:30 -0800)]
Starhub RTSP apparently does not establish time on all tracks
i.e. the "SR" RTCP packet is sent for only one of the two tracks.
fake timestamps if that's the case, previously we'd only fake timestamps
if we didn't receive _any_ "SR" packets.
Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1
related-to-bug:
5669027
Glenn Kasten [Fri, 20 Jan 2012 20:16:06 +0000 (12:16 -0800)]
Merge "Fix typos in string constants"
Glenn Kasten [Fri, 20 Jan 2012 20:15:38 +0000 (12:15 -0800)]
Merge "Remove dead file include/media/thread_init.h"
Glenn Kasten [Fri, 20 Jan 2012 20:14:32 +0000 (12:14 -0800)]
Merge "Remove redundant get()"
Glenn Kasten [Fri, 20 Jan 2012 19:49:04 +0000 (11:49 -0800)]
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
Glenn Kasten [Tue, 10 Jan 2012 18:46:34 +0000 (10:46 -0800)]
Remove redundant get()
get() is almost always unnecessary, except in a LOG.
Also no need to check for != 0 before calling get().
Change-Id: Ib06e7a503f86cf102f09acc1ffb2ad085025516d
Glenn Kasten [Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)]
Merge "Remove dead setRingerMode(mode, mask)"
Andreas Huber [Thu, 19 Jan 2012 22:40:44 +0000 (14:40 -0800)]
Merge "Make sure the ThrottledSource reports the proper mime type"
Andreas Huber [Thu, 19 Jan 2012 22:17:49 +0000 (14:17 -0800)]
Make sure the ThrottledSource reports the proper mime type
of the underlying source.
Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
Glenn Kasten [Thu, 19 Jan 2012 18:13:52 +0000 (10:13 -0800)]
Remove dead file include/media/thread_init.h
Change-Id: I98688bb7109b5f82953988935c7c33fe3c7f4ec0
Eric Laurent [Thu, 19 Jan 2012 18:00:02 +0000 (10:00 -0800)]
resolved conflicts for merge of
05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
Glenn Kasten [Thu, 19 Jan 2012 16:14:08 +0000 (08:14 -0800)]
Fix typos in string constants
These were copy/paste errors in code that was copied from AudioTrack.
Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
Glenn Kasten [Thu, 19 Jan 2012 14:10:37 +0000 (06:10 -0800)]
Merge "Fix incorrect includes of AudioTrack.h"
Glenn Kasten [Thu, 19 Jan 2012 14:09:20 +0000 (06:09 -0800)]
Merge "Simplify range check for audio_mode_t (continued)"
Glenn Kasten [Thu, 19 Jan 2012 14:09:05 +0000 (06:09 -0800)]
Merge "Add units to time periods"
Glenn Kasten [Thu, 19 Jan 2012 14:08:53 +0000 (06:08 -0800)]
Merge "Use const const strings for arrays and pointers to strings"
Glenn Kasten [Thu, 19 Jan 2012 14:08:40 +0000 (06:08 -0800)]
Merge "For booleans, use ! instead of == false"
Eric Laurent [Thu, 19 Jan 2012 00:08:06 +0000 (16:08 -0800)]
am
db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit '
db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
Glenn Kasten [Wed, 18 Jan 2012 22:54:46 +0000 (14:54 -0800)]
Fix incorrect includes of AudioTrack.h
Remove unnecessary includes of AudioTrack.h.
Use forward declaration of class names in preference to #include when possible.
Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
Glenn Kasten [Wed, 18 Jan 2012 22:58:32 +0000 (14:58 -0800)]
Simplify range check for audio_mode_t (continued)
Missed one place in earlier CL of same name
Change-Id: I0dd25364d0b8d5d731c02d352f139a0c8d4df1a8
Glenn Kasten [Mon, 9 Jan 2012 16:33:38 +0000 (08:33 -0800)]
Add units to time periods
Change-Id: Ib980e2676cecf5d9b0c2e388da6dc8e370df8abb
Glenn Kasten [Mon, 9 Jan 2012 16:41:22 +0000 (08:41 -0800)]
Use const const strings for arrays and pointers to strings
Change-Id: I0a073e17ebf6ad59e7edbedac104c6fa4bcaf9c9
Glenn Kasten [Fri, 13 Jan 2012 23:54:24 +0000 (15:54 -0800)]
For booleans, use ! instead of == false
Change-Id: Ibc115936d2d0b0b7744ebe9b52839ea5b42c4edd
Glenn Kasten [Wed, 18 Jan 2012 22:56:06 +0000 (14:56 -0800)]
Remove dead setRingerMode(mode, mask)
Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
Eric Laurent [Wed, 18 Jan 2012 03:20:12 +0000 (19:20 -0800)]
AudioFlinger: mix track only when really ready (2)
This problem due to the way audio buffers are mixed when
low power mode is active was addressed by commits
19ddf0eb
and
8a04fe03 but only partially. As a matter of fact, when more
than one audio track is playing, the problem is still present.
This is most noticeable when playing music with screen off
and a notification or navigation instruction is played: in this case,
the music or notification is likely to skip.
The fix consists in declaring the mixer ready if all active tracks
are ready. Previous behavior was to declare ready if at least one track was
ready. To avoid that one application failing to fill the track buffer blocks other
tracks indefinitely, this condition is respected only if the mixer was ready
in the previous round.
Issue
5799167.
Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
Andreas Huber [Wed, 18 Jan 2012 19:01:00 +0000 (11:01 -0800)]
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
Andreas Huber [Wed, 18 Jan 2012 18:51:55 +0000 (10:51 -0800)]
Temporarily restore AudioSystem/AudioTrack APIs with their former signatures
until we get updated prebuilts from vendor.
Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
Andreas Huber [Wed, 18 Jan 2012 17:29:56 +0000 (09:29 -0800)]
Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
Bryan Mawhinney [Wed, 18 Jan 2012 16:58:19 +0000 (08:58 -0800)]
Merge "Make sure seek triggers a reconnect if needed."
Glenn Kasten [Wed, 18 Jan 2012 15:46:18 +0000 (07:46 -0800)]
Merge "Track volume cleanup"
Bryan Mawhinney [Wed, 18 Jan 2012 13:40:07 +0000 (13:40 +0000)]
Make sure seek triggers a reconnect if needed.
Previously, if we had disconnected at the high watermark,
the read immediately following a seek would fail, and would
not be retried, resulting in an error.
Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
Eric Laurent [Wed, 18 Jan 2012 01:35:03 +0000 (17:35 -0800)]
Merge "audio framework: manage stream volume per device"
Glenn Kasten [Tue, 17 Jan 2012 20:20:54 +0000 (12:20 -0800)]
Track volume cleanup
Always read and write track volumes atomically. In most places this was
already being done, but there were a couple places where the left and
right channels were read independently.
Changed constant MAX_GAIN_INT to be a uint32_t instead of a float.
It is always used as a uint32_t in comparisons and assignments.
Use MAX_GAIN_INT in more places.
Now that volume is always accessed atomically, removed the union
and alias for uint16_t volume[2], and kept only volumeLR.
Removed volatile as it's meaningless.
In AudioFlinger, clamp the track volumes read from shared memory
before applying master and stream volume.
Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
Glenn Kasten [Wed, 11 Jan 2012 17:52:19 +0000 (09:52 -0800)]
Move memcpy_to_i16_from_u8 to audio_utils
This will make it easier for this kind of code to be optimized
for each target architecture.
Change-Id: I9efd27d6c0175b00b9a784353244805cec63c0b8
Eric Laurent [Sat, 19 Nov 2011 00:43:31 +0000 (16:43 -0800)]
audio framework: manage stream volume per device
Improve volume management by keeping track of volume for each type
of device independently.
Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained
per device.
The main changes are:
- AudioService now keeps tracks of stream volumes per device:
volume indexes are kept in a HashMap < device , index>.
active device is queried from policy manager when a volume change request
is received
initalization, mute and unmute happen on all device simultaneously
- Settings: suffixes is added to volume keys to store each device
volume independently.
- AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument
to setStreamVolumeIndex() and getStreamVolumeIndex() to address each
device independently.
- AudioPolicyManagerBase: keep track of stream volumes for each device
and apply volume according to current device selection.
Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
Glenn Kasten [Tue, 17 Jan 2012 22:10:07 +0000 (14:10 -0800)]
Merge "Remove dead setVolume() and mVolume[2]"
Glenn Kasten [Tue, 17 Jan 2012 20:20:38 +0000 (12:20 -0800)]
Remove dead setVolume() and mVolume[2]
Change-Id: I94b835434093e920432614eb5007101e87758f32
Glenn Kasten [Mon, 16 Jan 2012 21:11:50 +0000 (13:11 -0800)]
Move fixed_fft to system/media/audio_utils
Change-Id: If8a03911434862a872539c313f54825ffb2cc672
Glenn Kasten [Tue, 17 Jan 2012 19:32:53 +0000 (11:32 -0800)]
Merge "Use audio_mode_t consistently"
Glenn Kasten [Tue, 17 Jan 2012 18:06:38 +0000 (10:06 -0800)]
Rename Visualizer::mLock
This avoids confusion with parent class AudioEffect's mLock which is
protected.
Change-Id: I2ae0b0869fe3c606f682252973795b34477951d0
Glenn Kasten [Fri, 6 Jan 2012 16:40:01 +0000 (08:40 -0800)]
Check stream type in AudioFlinger::createTrack
A bad parameter to AudioFlinger::createTrack could cause mediaserver to crash.
Other AudioFlinger stream type cleanup:
- Simplify range check for audio_stream_type_t
- Add comment about mStreamTypes array initialization.
Change-Id: Ia33aa1cce0fdd694b08d9288816ffc097a9543d0
Glenn Kasten [Tue, 17 Jan 2012 15:28:14 +0000 (07:28 -0800)]
Merge "Fix locking for mMasterVolume and mMute"
Glenn Kasten [Tue, 17 Jan 2012 15:27:46 +0000 (07:27 -0800)]
Merge "Use size_t for frame size"
Glenn Kasten [Tue, 17 Jan 2012 15:25:36 +0000 (07:25 -0800)]
Merge "Use audio_stream_type_t consistently"
Glenn Kasten [Tue, 17 Jan 2012 15:18:26 +0000 (07:18 -0800)]
Merge "AudioTrack and AudioFlinger send level cleanup"
Dongwon Kang [Sun, 15 Jan 2012 03:00:34 +0000 (12:00 +0900)]
AVIExtractor: adding a H264 fourCC which is also specified in the reference.
(H264 code can be found avi file which is encoded with FFmpeg.)
Change-Id: Id9eccd4580443f42b2afa491c94ac2c2faa37f87
Glenn Kasten [Tue, 13 Dec 2011 19:47:54 +0000 (11:47 -0800)]
Fix locking for mMasterVolume and mMute
mMasterVolume and mMute are both protected by mutex in AudioFlinger class, but
there were two places where they were accessed without a mutex.
Also make AudioFlinger::mMasterMute private not protected.
Change-Id: Ia3897daeb5c50313df5bcc071824357526237f3e
Glenn Kasten [Tue, 3 Jan 2012 22:22:33 +0000 (14:22 -0800)]
AudioTrack and AudioFlinger send level cleanup
Add an API to control block for getting/setting send level.
This allow us to make the mSendLevel field private.
Document the lack of barriers.
Use 0.0f to initialize floating-point values (for doc only).
Change-Id: I59f83b00adeb89eeee227e7648625d9a835be7a4
Glenn Kasten [Wed, 11 Jan 2012 17:48:27 +0000 (09:48 -0800)]
Use size_t for frame size
except in the control block, where we don't have room.
In AudioFlinger::ThreadBase::TrackBase::getBuffer,
read the frame size from control block only once.
Change-Id: Id6c4bccd4ed3e07d91df6bbea43bae45524f9f4e
David 'Digit' Turner [Fri, 13 Jan 2012 22:32:50 +0000 (14:32 -0800)]
Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:28:09 +0000 (11:28 -0800)]
am
c0ef548c: am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:25:09 +0000 (11:25 -0800)]
am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:22:08 +0000 (11:22 -0800)]
am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Glenn Kasten [Fri, 13 Jan 2012 00:38:12 +0000 (16:38 -0800)]
Use audio_stream_type_t consistently
At native level it was a mixture of audio_stream_type_t, int, uint32_t,
and uint8_t. Java is still int. Also fixed a couple of hard-coded -1
instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0
instead of AUDIO_STREAM_VOICE_CALL.
Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
David 'Digit' Turner [Fri, 13 Jan 2012 13:17:29 +0000 (14:17 +0100)]
media/mtp: Add missing LOCAL_C_INCLUDES
One of the source files here is including <cutils/tztime.h> which
itself includes <bionic_time.h>, a private C library header used
to define the strftime_tz() extension (which used to be declared
in <time.h> but was moved there instead).
Add a missing C include path to let our code compile as usual.
Change-Id: I6aac2f1d3d15ad182679c81ff3f4febff74eb671
James Dong [Fri, 13 Jan 2012 00:56:58 +0000 (16:56 -0800)]
Merge "Separate sniffing from session initialization"
James Dong [Tue, 10 Jan 2012 16:24:37 +0000 (08:24 -0800)]
Separate sniffing from session initialization
This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened
o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate
sniffer/extractor
related-to-bug:
5725548
Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
Glenn Kasten [Thu, 12 Jan 2012 18:30:28 +0000 (10:30 -0800)]
Merge "Use audio_format_t consistently"
Glenn Kasten [Wed, 4 Jan 2012 19:00:47 +0000 (11:00 -0800)]
Use audio_mode_t consistently
It was int or uint32_t.
Also make getMode() const.
Change-Id: Ibe45aadbf413b9158e4dd17f2b3bcc6355288d37
The Android Open Source Project [Thu, 12 Jan 2012 17:00:21 +0000 (09:00 -0800)]
am
ce77af47: Reconcile with ics-mr1-release
* commit '
ce77af47e979d365155e4003ca2943b639600e73':
The Android Open Source Project [Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
Mans Rullgard [Tue, 5 Apr 2011 14:40:06 +0000 (17:40 +0300)]
stagefright aacenc/amrwbenc: Remove trailing whitespace
This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent,
d94b71d, is empty.)
Therefore, reapply the rest of these changes on the files
that still are present in the current version.
Change-Id: I645a9b9134769958a11808a06163123d28d83e46
The Android Automerger [Thu, 12 Jan 2012 00:29:04 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Wed, 4 Jan 2012 20:38:13 +0000 (12:38 -0800)]
libmedia new can't fail on Android
Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
Glenn Kasten [Wed, 11 Jan 2012 19:40:27 +0000 (11:40 -0800)]
Merge "Fix race in AudioSystem::getInputBufferSize"
Glenn Kasten [Wed, 11 Jan 2012 19:39:06 +0000 (11:39 -0800)]
Merge "Fix bug in JetPlayer::loadFromFile"
Glenn Kasten [Wed, 11 Jan 2012 19:38:21 +0000 (11:38 -0800)]
Merge "Simplify range check for audio_mode_t"
Eric Laurent [Wed, 11 Jan 2012 19:14:30 +0000 (11:14 -0800)]
am
05985a2e: am
c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '
05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
stagefright: limit audio gap for looped playback
Eric Laurent [Wed, 11 Jan 2012 19:12:45 +0000 (11:12 -0800)]
am
c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '
c15cf3d286f3d63d141b73f639a5a61ddb028029':
stagefright: limit audio gap for looped playback
Glenn Kasten [Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)]
Merge "Use correct type for hardware call state"
Glenn Kasten [Wed, 11 Jan 2012 18:23:34 +0000 (10:23 -0800)]
Merge "Declare IAudioTrack methods in binder opcode order"
Glenn Kasten [Wed, 11 Jan 2012 18:23:04 +0000 (10:23 -0800)]
Merge "Use consistent style of & reference for AutoMutex"
Glenn Kasten [Wed, 11 Jan 2012 18:22:45 +0000 (10:22 -0800)]
Merge "Fix missing tag in mediaserver ServiceManager: log"
Glenn Kasten [Wed, 11 Jan 2012 18:22:19 +0000 (10:22 -0800)]
Merge "AudioFlinger new can't fail"
Glenn Kasten [Wed, 11 Jan 2012 18:01:34 +0000 (10:01 -0800)]
Merge "Fix build warning"
Eino-Ville Talvala [Tue, 26 Jul 2011 21:06:07 +0000 (14:06 -0700)]
Add ANativeWindow timestamp support to camera service.
This allows the camera HAL to set ANativeWindow timestamps, which
are used by SurfaceTexture.
Bug-Id:
5081132
Change-Id: I123ea4c9d1824fb72146fad81ad03d1491e0a7f8
Glenn Kasten [Tue, 10 Jan 2012 17:01:19 +0000 (09:01 -0800)]
Fix race in AudioSystem::getInputBufferSize
It was caching the recording parameters without a mutex.
Change-Id: Ic4b9f621cbc080d224c2233cf3ca3454fc0f19bd
Glenn Kasten [Tue, 10 Jan 2012 16:41:33 +0000 (08:41 -0800)]
Fix bug in JetPlayer::loadFromFile
A long pathname would corrupt the heap due to incorrect use of strncpy.
Also was using hard-coded constant 256 instead of PATH_MAX.
Change-Id: Iba382bbb38624fbc41fec91449f9814f77d4ac0d
Glenn Kasten [Sat, 7 Jan 2012 00:47:31 +0000 (16:47 -0800)]
Simplify range check for audio_mode_t
AudioSystem::setMode previously allowed negative modes, but these were
then rejected by AudioFlinger.
Now negative modes (including AUDIO_MODE_INVALID and AUDIO_MODE_CURRENT)
are explicitly disallowed.
Change-Id: I0bac8fea737c8eb1f5b6afbb893e48739f88d745
Eric Laurent [Mon, 9 Jan 2012 21:47:48 +0000 (13:47 -0800)]
stagefright: limit audio gap for looped playback
The audio gap when looping audio is mostly due to
a delay requested by the audio player when executing
the end of stream message. This is to allow the audio
to be drained out of the pipe before actually stopping the
AudioTrack.
This delay is not needed when looping as the AudioTrack
is not stopped.
The fix consists in ignoring the requested delay when the
looping flag is set in awesome player.
Issue
5800981.
Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
Steve Block [Mon, 9 Jan 2012 18:35:44 +0000 (18:35 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519
Bug:
5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
Glenn Kasten [Mon, 9 Jan 2012 19:59:17 +0000 (11:59 -0800)]
Merge "By convention const goes before the type specifier"
Glenn Kasten [Tue, 3 Jan 2012 23:28:29 +0000 (15:28 -0800)]
Use cached reference to media.player service
This save unnecessary binder calls
Change-Id: I93a60efc54d9c8fb8fab706cd4477bbfd00ffec8
Glenn Kasten [Mon, 9 Jan 2012 18:25:00 +0000 (10:25 -0800)]
Merge "Replace loop by __builtin_ctz"
Glenn Kasten [Mon, 9 Jan 2012 18:24:40 +0000 (10:24 -0800)]
Merge "Clean up AudioTrack::mActive and stopped()"
Glenn Kasten [Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)]
Merge "suspended() and isSuspended() are const"
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug:
5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
The Android Open Source Project [Sat, 7 Jan 2012 02:18:36 +0000 (18:18 -0800)]
am
20090b30: Reconcile with ics-mr1-release
* commit '
20090b30340f9382a2eca6a9bed21117f7a27d7e':
The Android Open Source Project [Sat, 7 Jan 2012 02:15:13 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
The Android Automerger [Sat, 7 Jan 2012 00:32:11 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eino-Ville Talvala [Fri, 6 Jan 2012 23:51:44 +0000 (15:51 -0800)]
am
4bc873e6: am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
4bc873e6ff73200af866f8c9efca66ad8ed23682':
Switch camera sounds to always use the system enforced audio stream.
Eino-Ville Talvala [Fri, 6 Jan 2012 23:49:17 +0000 (15:49 -0800)]
am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
Glenn Kasten [Fri, 6 Jan 2012 23:03:11 +0000 (15:03 -0800)]
AudioFlinger new can't fail
Change-Id: I7dae05a5ea1c962a9975386eab1fedbbe106ffba
Glenn Kasten [Mon, 19 Dec 2011 22:09:14 +0000 (14:09 -0800)]
Fix missing tag in mediaserver ServiceManager: log
Change-Id: I2d5525ffee0b66c0bc361a02b313ec4dd61e6552
Glenn Kasten [Tue, 3 Jan 2012 22:50:23 +0000 (14:50 -0800)]
Declare IAudioTrack methods in binder opcode order
This makes it easier to match up the declarations.
Change-Id: I0996c20b2903b778b356dfe52b07b0ec634855dd
Glenn Kasten [Thu, 5 Jan 2012 23:41:56 +0000 (15:41 -0800)]
Use consistent style of & reference for AutoMutex
AutoMutex, which is a typedef for Mutex::Autolock, is overloaded for
either a reference (&) or pointer (*) parameter, but we prefer to use
the reference form when the mutex is known at compile time.
Change-Id: I3515e6d6ab7959b2356a27fa3b04fd49e42cb31e
Glenn Kasten [Wed, 4 Jan 2012 19:02:33 +0000 (11:02 -0800)]
Use correct type for hardware call state
Change-Id: Ic6d98b129e3ec653df1d8f7e829adf8dccb4f378