OSDN Git Service
The Android Automerger [Mon, 3 Oct 2011 14:00:16 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Gilles-Arnaud Bleu-Laine [Fri, 16 Sep 2011 02:30:13 +0000 (21:30 -0500)]
Gracefuly return on detecting wrong AAC format from corrupted files
Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.
The current CHECK() interrupts the configurecodec() preventing a graceful
exit.
Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
The Android Automerger [Thu, 29 Sep 2011 00:57:52 +0000 (17:57 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Wed, 28 Sep 2011 23:08:59 +0000 (16:08 -0700)]
Merge "Support multiple NAL fragments per .mkv payload"
Andreas Huber [Wed, 28 Sep 2011 22:06:46 +0000 (15:06 -0700)]
Support multiple NAL fragments per .mkv payload
Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.
Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug:
5337218
James Dong [Wed, 28 Sep 2011 20:46:49 +0000 (13:46 -0700)]
Merge "Flush resets the count of played audio frames"
Andreas Huber [Wed, 28 Sep 2011 19:37:36 +0000 (12:37 -0700)]
Support AMR, G.711 and vorbis audio in ACodec and friends.
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
The Android Automerger [Wed, 28 Sep 2011 14:09:11 +0000 (07:09 -0700)]
merge in ics-release history after reset to master
James Dong [Wed, 28 Sep 2011 05:47:25 +0000 (22:47 -0700)]
Flush resets the count of played audio frames
Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug:
5331470
Andreas Huber [Tue, 27 Sep 2011 22:26:43 +0000 (15:26 -0700)]
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
Andreas Huber [Tue, 27 Sep 2011 22:05:40 +0000 (15:05 -0700)]
Cut down on AwesomePlayer and OMXCodec's verbosity.
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug:
5382014
Eric Laurent [Tue, 27 Sep 2011 21:07:45 +0000 (14:07 -0700)]
Merge "Fix issue
5373658: memory leak in AudioFlinger."
Andreas Huber [Tue, 27 Sep 2011 20:36:22 +0000 (13:36 -0700)]
Merge "Signal an appropriate error even if there are no active streams yet."
Andreas Huber [Tue, 27 Sep 2011 19:12:25 +0000 (12:12 -0700)]
Signal an appropriate error even if there are no active streams yet.
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug:
5372901
Eric Laurent [Tue, 27 Sep 2011 19:07:15 +0000 (12:07 -0700)]
Fix issue
5373658: memory leak in AudioFlinger.
Unlink PowerManagerService binder interface death recipient
in ThreadBase destructor.
Change-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5
Eric Laurent [Tue, 27 Sep 2011 17:32:17 +0000 (10:32 -0700)]
Merge "Fix issue
5373048: AudioCache decode errors"
Eric Laurent [Tue, 27 Sep 2011 16:48:56 +0000 (09:48 -0700)]
Fix issue
5373048: AudioCache decode errors
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.
Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
The Android Automerger [Tue, 27 Sep 2011 14:00:12 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
The Android Open Source Project [Mon, 26 Sep 2011 19:11:29 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
Andreas Huber [Mon, 26 Sep 2011 18:26:59 +0000 (11:26 -0700)]
Merge "Properly connect to surface flinger in our shell tools"
Andreas Huber [Mon, 26 Sep 2011 17:53:29 +0000 (10:53 -0700)]
Propagate error signalled by the source all the way to the output EOS notification.
Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug:
5372901
Andreas Huber [Mon, 26 Sep 2011 15:09:11 +0000 (08:09 -0700)]
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
The Android Automerger [Sun, 25 Sep 2011 14:00:19 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Fri, 23 Sep 2011 21:05:49 +0000 (14:05 -0700)]
Support even more .avi files with .mp3 content not aligned to chunk boundaries
Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d
related-to-bug:
5349382
Eric Laurent [Fri, 23 Sep 2011 21:43:12 +0000 (14:43 -0700)]
Merge "Fix issue
5355047: Automated effect tests fail."
The Android Automerger [Fri, 23 Sep 2011 18:35:01 +0000 (11:35 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Andreas Huber [Fri, 23 Sep 2011 18:27:51 +0000 (11:27 -0700)]
Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
Andreas Huber [Fri, 23 Sep 2011 17:25:32 +0000 (10:25 -0700)]
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
Change-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7
Eric Laurent [Fri, 23 Sep 2011 15:40:41 +0000 (08:40 -0700)]
Fix issue
5355047: Automated effect tests fail.
Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.
- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.
Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
Wei Huang [Fri, 23 Sep 2011 17:05:22 +0000 (10:05 -0700)]
am
3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '
3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
Wei Huang [Fri, 23 Sep 2011 17:04:02 +0000 (10:04 -0700)]
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
Pannag Sanketi [Fri, 23 Sep 2011 16:08:11 +0000 (09:08 -0700)]
am
1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
* commit '
1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
Pannag Sanketi [Fri, 23 Sep 2011 00:03:48 +0000 (17:03 -0700)]
Returning EOS in SurfaceMediaSource:read
In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.
Related to FactoryROM bug:
5332812
Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
The Android Automerger [Thu, 22 Sep 2011 14:00:05 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Wu-cheng Li [Thu, 22 Sep 2011 03:43:28 +0000 (11:43 +0800)]
Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.
bug:
5356404
Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
Edwin Wong [Thu, 22 Sep 2011 06:05:57 +0000 (23:05 -0700)]
Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG:
5284436"
Edwin Wong [Thu, 22 Sep 2011 02:18:30 +0000 (19:18 -0700)]
Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.
BUG:
5284436
Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
Andreas Huber [Wed, 21 Sep 2011 20:56:09 +0000 (13:56 -0700)]
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
Andreas Huber [Wed, 21 Sep 2011 20:19:54 +0000 (13:19 -0700)]
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677
related-to-bug:
5349382
Glenn Kasten [Wed, 21 Sep 2011 17:40:01 +0000 (10:40 -0700)]
Bug
5234242 audio continues after discontinuity
Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets.
Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
The Android Automerger [Wed, 21 Sep 2011 14:00:07 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Thu, 15 Sep 2011 19:42:32 +0000 (12:42 -0700)]
Properly connect to surface flinger in our shell tools
Also raise the layer to INT_MAX to float in front of the toolbar.
Change-Id: I045a1c83924e6655f1734d15f2504b90312eec64
The Android Open Source Project [Tue, 20 Sep 2011 14:43:10 +0000 (07:43 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
The Android Automerger [Tue, 20 Sep 2011 14:00:19 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 20 Sep 2011 13:28:15 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
James Dong [Mon, 19 Sep 2011 23:27:31 +0000 (16:27 -0700)]
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug:
5145483
James Dong [Tue, 20 Sep 2011 03:09:00 +0000 (20:09 -0700)]
am
92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '
92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
James Dong [Mon, 19 Sep 2011 23:27:31 +0000 (16:27 -0700)]
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug:
5145483
Andreas Huber [Mon, 19 Sep 2011 19:18:47 +0000 (12:18 -0700)]
Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
containing B-frames.
Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642
related-to-bug:
5336497
Andreas Huber [Mon, 19 Sep 2011 15:54:59 +0000 (08:54 -0700)]
Merge "In order to recover from video lagging behind audio, drop avc frames"
The Android Automerger [Sun, 18 Sep 2011 14:00:21 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Fri, 16 Sep 2011 22:09:22 +0000 (15:09 -0700)]
In order to recover from video lagging behind audio, drop avc frames
that are not referenced by other frames before feeding them into the decoder.
Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
Nick Kralevich [Fri, 16 Sep 2011 20:56:16 +0000 (13:56 -0700)]
Merge "AudioResampler: use relative instead of absolute labels"
Nick Kralevich [Fri, 16 Sep 2011 20:14:16 +0000 (13:14 -0700)]
AudioResampler: use relative instead of absolute labels
This change is needed to allow Android to compile with -fPIE
Bug:
5328392
Change-Id: I84d947975776800a7b79c6ac75a881af461a631c
Andreas Huber [Thu, 15 Sep 2011 19:25:04 +0000 (12:25 -0700)]
Various improvements to nuplayer playback
- Drastically cut down the number of times we supply the AudioSink with data
by estimating the time until the sink would run out of data and then scheduling
a refill in advance of that.
- Use a dedicated looper for video decoders since they are currently taking
too long to return from OMX_FillThisBuffer (bug
5325201)
- Revise thread priorities for the OMX dispatcher and software codecs, instead
of running them at ANDROID_PRIORITY_AUDIO, they now only run at
ANDROID_PRIORITY_FOREGROUND
- Since threads created by pthread_create inherit all of the parent threads
attributes including thread priority, briefly reset thread priority to
ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then
restore it.
Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
The Android Automerger [Thu, 15 Sep 2011 13:34:24 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
James Dong [Thu, 15 Sep 2011 00:42:22 +0000 (17:42 -0700)]
Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications"
The Android Automerger [Wed, 14 Sep 2011 13:34:13 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Eric Laurent [Wed, 14 Sep 2011 00:50:31 +0000 (17:50 -0700)]
Merge "Issue
5298399: Lost speech after a crash in gTalk."
Eric Laurent [Tue, 13 Sep 2011 22:04:17 +0000 (15:04 -0700)]
Issue
5298399: Lost speech after a crash in gTalk.
Fixed problem in AudioTrack::restoreTrack_l() causing a permanent
failure if the IAudioTrack interface to AudioFlinger could not be
restored at the first attempt.
Change-Id: I039d4fe2dca8d3baf71f1a6c51119f27a67b6611
Eric Laurent [Tue, 13 Sep 2011 19:57:37 +0000 (12:57 -0700)]
Merge "Issue
4345021: Audio routed to multiple devices..."
Eric Laurent [Tue, 13 Sep 2011 18:40:21 +0000 (11:40 -0700)]
Issue
4345021: Audio routed to multiple devices...
There is a possiblility that the condition on which RecordThread::checkForNewParameters_l()
waits after updating the command completion status is never signalled.
This happens if the thread executing ThreadBase::setParameters() has timed out waiting
for the status (for instance if the audio HAL takes too long to execute the setParameters()
command. Then the RecordThread is stuck forever.
The fix consists in waiting for the condition with a timeout in RecordThread::checkForNewParameters_l().
Change-Id: I7fc671bc2fc43ba4acb65a2beb33ee05742f091e
Andreas Huber [Tue, 13 Sep 2011 18:37:22 +0000 (11:37 -0700)]
Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
Andreas Huber [Tue, 13 Sep 2011 18:12:57 +0000 (11:12 -0700)]
Support .avi tracks that have a sample size of 1, i.e. samples != chunks
Assume for now that all chunks are the same size, i.e. have the same number of
samples.
Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8
related-to-bug:
5279872
James Dong [Tue, 13 Sep 2011 02:56:23 +0000 (19:56 -0700)]
Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications
Change-Id: I522a994981d86329ccc86c3b536b561dc6e40eeb
related-to-bug:
5300618
Andreas Huber [Tue, 13 Sep 2011 15:28:38 +0000 (08:28 -0700)]
Don't post position updates too frequently
i.e. don't hog my message queue.
related-to-bug:
5284760
Change-Id: I8e2d36a11dbee1567b18ed13dc5257a65c6eeda7
The Android Automerger [Tue, 13 Sep 2011 13:34:10 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Mon, 12 Sep 2011 21:21:42 +0000 (14:21 -0700)]
Merge "Turn an another assertion into a runtime error in ACodec's implementation"
Andreas Huber [Mon, 12 Sep 2011 21:14:08 +0000 (14:14 -0700)]
Turn an another assertion into a runtime error in ACodec's implementation
Change-Id: I6779b29f200b90d088273ab3204724ef3d8d59bd
related-to-bug:
5284760
Andreas Huber [Mon, 12 Sep 2011 20:49:00 +0000 (13:49 -0700)]
Increase the avi extractor's confidence slighly over mp3's
So that we don't accidentally identify a .avi file containing an mp3 track as
an mp3 file.
Change-Id: I73495b80cbb5bc1007bf810f2db453c9f175171b
related-to-bug:
5288189
The Android Automerger [Sun, 11 Sep 2011 13:41:51 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
Guang Zhu [Thu, 8 Sep 2011 06:55:27 +0000 (23:55 -0700)]
Make MediaScanner skip certain directories
The list of directories to skip are configurable via setprop.
The main motivation is that some test data folder takes long time
to scan, and media scanner may compete for CPU time against perf
tests therefore skewing the results.
Bug:
5263115
Change-Id: I568213e2a4babf6033021c1d336ef0347c0e3315
James Dong [Fri, 9 Sep 2011 21:56:30 +0000 (14:56 -0700)]
Merge "Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
James Dong [Fri, 9 Sep 2011 20:19:59 +0000 (13:19 -0700)]
Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation
Change-Id: Iee9b18449bce9d7565ab5cc7f9e999484051196c
related-to-bug:
5233843
Eric Laurent [Thu, 8 Sep 2011 23:07:40 +0000 (16:07 -0700)]
Merge "AudioTrack: extend callback thread sleep time"
Pannag Sanketi [Thu, 8 Sep 2011 22:33:31 +0000 (15:33 -0700)]
Merge "Always set geometry in queuebuffer"
Eric Laurent [Wed, 7 Sep 2011 18:13:23 +0000 (11:13 -0700)]
AudioTrack: extend callback thread sleep time
Do not force wake up the AudioTrack thread every 10ms if no timed
events (loop, markers..) have to be processed.
This will help reduce power consumption.
Change-Id: Icb425b13800690008dd07c27ffac84739e3dbba3
Pannag Sanketi [Thu, 8 Sep 2011 21:15:00 +0000 (14:15 -0700)]
Always set geometry in queuebuffer
The queuebuffer could return early due to timestamp issues. Need to set
the geometry even in that case.
Change-Id: I04d7cd1df3996d640c269285398c0042923ba920
Andreas Huber [Thu, 8 Sep 2011 18:33:47 +0000 (11:33 -0700)]
Audio player must not be used as a timesource before it's started.
Otherwise it'll trigger a division-by-zero exception since the audio sample rate
is as yet unknown.
Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53
related-to-bug:
5242451
The Android Automerger [Thu, 8 Sep 2011 13:34:13 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Glenn Kasten [Wed, 7 Sep 2011 21:40:23 +0000 (14:40 -0700)]
Bug
5270905 fix MediaPlayer with IStreamSource
Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
Glenn Kasten [Wed, 7 Sep 2011 21:56:47 +0000 (14:56 -0700)]
Merge "Bug
5270905 fix MediaPlayer with IStreamSource"
Glenn Kasten [Wed, 7 Sep 2011 21:40:23 +0000 (14:40 -0700)]
Bug
5270905 fix MediaPlayer with IStreamSource
Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
Pannag Sanketi [Wed, 7 Sep 2011 21:18:41 +0000 (14:18 -0700)]
Merge "Fixing bug in SurfaceMediaSource_test"
Andreas Huber [Wed, 7 Sep 2011 18:05:43 +0000 (11:05 -0700)]
Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable
fortunately in all our supported audio encodings we can treat every frame as
a keyframe.
Change-Id: I32f21d0077bbae7ef9efe725dd351baf531179e2
related-to-bug:
5263837
Andreas Huber [Wed, 7 Sep 2011 16:05:04 +0000 (09:05 -0700)]
Merge "Stop metadata retriever from dereferencing a NULL pointer if"
The Android Automerger [Wed, 7 Sep 2011 13:34:10 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
James Dong [Wed, 7 Sep 2011 02:18:43 +0000 (19:18 -0700)]
Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
This reverts commit
983ab88e117fcbda9370b8f4ba94271d37149672.
related-to-bug:
5231309
Dave Burke [Tue, 6 Sep 2011 19:39:47 +0000 (20:39 +0100)]
Handle setDataSource failures properly. #
5261671
Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
Andreas Huber [Tue, 6 Sep 2011 23:05:02 +0000 (16:05 -0700)]
Stop metadata retriever from dereferencing a NULL pointer if
the media extractor failed to initialize (malformed or unsupported content)
Change-Id: Icfad4e9eeb8d6713ad12eee7979ab30b696c06e0
related-to-bug:
5263840
Eric Laurent [Tue, 6 Sep 2011 21:53:59 +0000 (14:53 -0700)]
Merge "Issue
5247986: Battery drain due to audio wakelock"
Eric Laurent [Tue, 6 Sep 2011 19:36:15 +0000 (12:36 -0700)]
Issue
5247986: Battery drain due to audio wakelock
The problem occurs when activating or deactivating A2DP connection
while SoudPool has a channel active. This can happen quite frequently now
that the UI sound effects are enabled by default.
If PCM data is remaining in the AudioTrack buffer when it is restroyed and
re-created on the new AudioFlinger output thread, this data is flushed.
As a consequence, no underrun or request for new data callback is sent to
SoundPool and the sound channel remains active for ever as the end of the
sample is never detected.
Change-Id: I13e0c11e4ce3f83bff7f58d347ca814b6a86712b
Dave Burke [Tue, 6 Sep 2011 20:06:20 +0000 (13:06 -0700)]
Merge "Handle setDataSource failures properly. #
5261671"
Dave Burke [Tue, 6 Sep 2011 19:39:47 +0000 (20:39 +0100)]
Handle setDataSource failures properly. #
5261671
Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
James Dong [Tue, 6 Sep 2011 16:54:43 +0000 (09:54 -0700)]
Merge "Don't overwrite pending port setting change if there are more than one port setting change event."
The Android Automerger [Mon, 5 Sep 2011 13:34:19 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Pannag Sanketi [Sat, 3 Sep 2011 00:56:35 +0000 (17:56 -0700)]
Fixing bug in SurfaceMediaSource_test
The test was making EGL calls once disconnected. Instead of calling
"disconnect" directly on the Surface, and EGL calls should be made to that
effect.
Change-Id: I21468ac8cbc2cb3145a49269e32a884736cd452e
The Android Automerger [Fri, 2 Sep 2011 23:02:32 +0000 (16:02 -0700)]
merge in ics-release history after reset to master
Eric Laurent [Fri, 2 Sep 2011 21:20:56 +0000 (14:20 -0700)]
Fix issue
5252593: any app can restart the runtime
Replace null device address string by empty sting.
Change-Id: I285c35f3345334e6d2190493b1a8a5aca1a361a4
Andreas Huber [Fri, 2 Sep 2011 16:34:51 +0000 (09:34 -0700)]
Properly serialize access to FileSource::getSize by acquiring the mutex
Both ::getSize and ::read call into lseek64, if this happens simultaneously
from multiple threads the results are undefined if not properly serialized.
Change-Id: I737cafebd836f3d8eb702beac557b4731f69c6f6
related-to-bug:
5196490