1159 Commits

Author SHA1 Message Date
Andreas Huber
593c6a5516 Merge "The mp3 decoder should not assert that decoding was successful but return an error instead." 2010-01-11 16:08:56 -08:00
Andreas Huber
b6d5d1b7b3 Merge "Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string." 2010-01-11 14:56:39 -08:00
Andreas Huber
afce2158a2 The mp3 decoder should not assert that decoding was successful but return an error instead. 2010-01-11 14:21:26 -08:00
Andreas Huber
5ebc8898d7 Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string.
related-to-bug: 2366619
2010-01-11 13:30:08 -08:00
San Mehat
0f5525ad3b framework: asec: Rename 'Cache' -> 'Container'
Signed-off-by: San Mehat <san@google.com>
2010-01-11 10:15:16 -08:00
Eric Laurent
84b42b8368 am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629'

* commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 16:28:21 -08:00
Romain Guy
980a938c1c Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:38 -08:00
Eric Laurent
d31d7397ba am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Andreas Huber
e4a838051d Reorganize some of the stagefright implementation related to metadata. 2010-01-08 11:54:36 -08:00
Eric Laurent
663ec30880 Fix issue 2361949: A2DP suspend parameters set wrongly.
Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to
BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService.
Previous implementation could cause a false reset of suspend state if a new sink attempted to
connect while A2DP was suspended.
New implementation only resets A2DP suspend state when a new sink is actually connected.
2010-01-08 08:48:18 -08:00
James Dong
a3452ad9be Merge "Add MPEG to the file extensions that scanner cares" 2010-01-06 17:26:01 -08:00
San Mehat
d1265febc4 Merge "framework: MountService: Add initial support for Android Secure External Caches" 2010-01-06 14:30:56 -08:00
Jean-Baptiste Queru
f66de3cd8e Fix typo: test -> tests in makefile tags
Change-Id: Icf23b5ae5d84f6ba9032d1707635a75352f920d2
2010-01-06 14:00:36 -08:00
San Mehat
3697229cc7 framework: MountService: Add initial support for Android Secure External Caches
Signed-off-by: San Mehat <san@google.com>
2010-01-06 13:54:41 -08:00
James Dong
1b50044a27 Add MPEG to the file extensions that scanner cares 2010-01-06 12:18:02 -08:00
Andreas Huber
89e91f7696 Quick and dirty implementation to follow http redirects in stagefright. 2010-01-05 13:39:04 -08:00
Andreas Huber
364b42170d Merge "Protect against possible temporary objects going away before we get at their data." 2010-01-05 11:28:58 -08:00
Andreas Huber
dd0359f7a2 Protect against possible temporary objects going away before we get at their data. 2010-01-05 11:13:08 -08:00
Andreas Huber
6b39ab4c52 Merge "I must have broken raw-audio decoding in the recent past, this fixes it." 2010-01-05 11:08:21 -08:00
Andreas Huber
c79827a76f I must have broken raw-audio decoding in the recent past, this fixes it.
related-to-bug: http://b/issue?id=2352199
2010-01-05 10:54:55 -08:00
Andreas Huber
67aee053ba Use stagefright for http streaming if the right property is set. 2010-01-05 09:27:02 -08:00
Marco Nelissen
7eca501433 Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING" 2010-01-04 15:10:33 -08:00
Marco Nelissen
9a488b44cb MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING 2010-01-04 15:09:03 -08:00
Andreas Huber
1a08ad1cae Merge "Make metadata support through stagefright property dependent until it's ready." 2010-01-04 15:08:32 -08:00
Andreas Huber
c4273482e0 Merge "Fix mpeg4/h.263 software decoder." 2010-01-04 15:07:36 -08:00
Andreas Huber
7782fdf5b7 Make metadata support through stagefright property dependent until it's ready. 2010-01-04 15:02:02 -08:00
Andreas Huber
2039bd93ed Fix mpeg4/h.263 software decoder. 2010-01-04 14:51:49 -08:00
Andreas Huber
6be8b14e25 Fix avc software decoder to properly handle SEI nalType and access unit delimiter. 2010-01-04 14:51:01 -08:00
Eric Laurent
a0b517609d am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'

* commit '68e9014e47f7350b3889e1704dde809b2a926968':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-27 16:33:17 -08:00
Dave Sparks
3c56221af7 Fix SoundPool restart problem CheckJNI issue. 2009-12-23 17:22:57 -08:00
Dave Sparks
1905530bb1 Replace sine with organ for some SoundPool tests. 2009-12-23 09:55:21 -08:00
Dave Sparks
d94466c4c8 Add SoundPool test 2009-12-23 09:47:12 -08:00
Android (Google) Code Review
011a3dfd85 Merge change I9120be33
* changes:
  Add OnLoadCompleteListener to SoundPool.
2009-12-23 09:45:23 -08:00
Dave Sparks
f6e43bf290 Add OnLoadCompleteListener to SoundPool. 2009-12-23 09:11:29 -08:00
Eric Laurent
cf4fc6263c am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'

* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
  Fix issues 2333450 and 2333559:
2009-12-22 23:46:16 -08:00
Eric Laurent
f31f365a77 am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
  Fix issues 2333450 and 2333559:
2009-12-22 23:41:59 -08:00
Eric Laurent
68e9014e47 am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp

* commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-22 17:42:17 -08:00
Eric Laurent
eb14a783be Fix issues 2333450 and 2333559:
Add new config values to AudioSystem::FOR_DOCK force usage to differenciate car and desk docks.
Use a receiver for the sticky Intent.ACTION_DOCK_EVENT in AudioService to detect the type
of dock and select force usage accordingly.
2009-12-22 16:20:46 -08:00
Doug Kwan
5038c78f13 Add missing shared libraries in linker commands. Currently these libraries are
linked implicitly via dependencies of other shared libraries.
2009-12-22 13:30:25 -08:00
Eric Laurent
484d288868 Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Add a separate system settings entry for bluetooth SCO volume.
2009-12-22 10:10:24 -08:00
James Dong
11b04a6e76 am 122fe7e1: am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '122fe7e10297ce51d63b6076a33573d217f3f1cc'

* commit '122fe7e10297ce51d63b6076a33573d217f3f1cc':
  Attempt to fix simular build break.
2009-12-19 09:03:27 -08:00
James Dong
122fe7e102 am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '4d0e827d0be6085893428b420ec5800f1973a43b' into eclair-mr2-plus-aosp

* commit '4d0e827d0be6085893428b420ec5800f1973a43b':
  Attempt to fix simular build break.
2009-12-19 09:00:17 -08:00
James Dong
4d0e827d0b Attempt to fix simular build break.
Missing header file stdlib.h for free, malloc, etc
2009-12-19 08:53:01 -08:00
James Dong
8852a67e3a am 2473eb4a: am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
Merge commit '2473eb4a33b226758e1f5db322cb8d687ce01602'

* commit '2473eb4a33b226758e1f5db322cb8d687ce01602':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
2009-12-19 08:29:59 -08:00
James Dong
2473eb4a33 am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp

* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
2009-12-19 08:26:03 -08:00
James Dong
4e4795c8c0 Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable 2009-12-18 18:51:41 -08:00
Gloria Wang
e48ad1af0f am 254e0025: am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542'

* commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542':
  Add support for XING header
2009-12-18 10:37:42 -08:00
Gloria Wang
254e00253c am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp

* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
  Add support for XING header
2009-12-18 10:34:18 -08:00
Android (Google) Code Review
791c626add Merge change Ibac388a3 into eclair-mr2
* changes:
  Add support for XING header
2009-12-18 10:30:37 -08:00
James Dong
254d160dd8 am 5614c2c6: am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '5614c2c677ce08561c93c6385dc3090dbf5760dc'

* commit '5614c2c677ce08561c93c6385dc3090dbf5760dc':
  Initial checkins of the mpeg4 and h263 software decoders based on PV
2009-12-18 09:57:22 -08:00