300 Commits

Author SHA1 Message Date
Eric Laurent
23f25cda0c Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.
Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream
type is playing.

Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
2010-01-25 14:00:10 -08:00
Eric Laurent
9272b4b4a4 Fix issue 2349345: Media sound output stuck on earpiece rather than speaker.
This change fixes a problem occuring when an application (for instance a VoIP application)
changes the audio mode to MODE_IN_CALL and crashes. In this case, the audio routing policy
remains as if we were in call until the audio mode is changed back to MODE_NORMAL, for instance when a new call
made or received and terminated.

The fix consists in registering a death receipient to the binder that made the setMode() request and resetting the audio
mode in case of client process crash.
2010-01-25 09:01:48 -08:00
Marco Nelissen
35b002a9c8 Make the media scanner disregard database entries that do not have
absolute path names. This allows us to store other things (perhaps
with http or content URIs) in the database, without the media scanner
removing them again.
2010-01-21 17:12:45 -08:00
Andreas Huber
1cb02bf661 Support for determining the mime type of media via metadata extraction. 2010-01-13 11:30:34 -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
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
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
1b50044a27 Add MPEG to the file extensions that scanner cares 2010-01-06 12:18:02 -08:00
Marco Nelissen
9a488b44cb MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING 2010-01-04 15:09:03 -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
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
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
Dianne Hackborn
83652ebfe1 am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp

* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:10:13 -08:00
Dianne Hackborn
1c633fc89b Implement API to have new broadcasts replace existing broadcasts.
Use this in various places where it should serve no purpose to deliver
both broadcasts.  This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
2009-12-14 15:03:35 -08:00
Jean-Michel Trivi
899858a396 am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp

* commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 16:58:35 -08:00
Jean-Michel Trivi
6608bd0d3a am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 16:46:13 -08:00
Jean-Michel Trivi
ed3e7ab3bf am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-plus-aosp

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-09 11:50:36 -08:00
Jean-Michel Trivi
6154412ee8 Partially fix bug 2111240 Detect docking / undocking event by reporting
to the AudioPolicyManager a new forced usage AudioSystem::FOR_DOCK
which can take the FORCE_NONE, FORCE_BT_DOCK or FORCE_WIRED_ACCESSORY
values. This CL is complemented by an update of the APM to take into
account the FOR_DOCK usage.
2009-12-07 20:42:52 -08:00
Eric Laurent
e30bae7f8e am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp

* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:06:15 -08:00
Eric Laurent
a4dde1da5f am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-plus-aosp

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:42 -08:00
Eric Laurent
b8341cf7c8 am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:17 -08:00
Eric Laurent
9cc489a219 Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
2009-12-07 05:37:47 -08:00
Ray Chen
da32419584 am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 12:02:04 -08:00
Ray Chen
d9fae01d5a am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-plus-aosp

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 11:57:34 -08:00
Ray Chen
8a576620cd am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 11:57:10 -08:00
Ray Chen
052d9c8b41 Images.Media.DATE_TAKEN should be in milliseconds.
http://b/2297371
2009-12-04 11:51:25 -08:00
Ray Chen
29d503c6cc am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 16:31:56 -08:00
Ray Chen
1b794bbbdc am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:35:45 -08:00
Ray Chen
3bd0a4843a am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-plus-aosp

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:35:36 -08:00
Android (Google) Code Review
e12de4d504 Merge change Id5fa58cf into eclair
* changes:
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:24:18 -08:00
Ray Chen
cb6203cdcb am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp

* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:35:12 -08:00
Ray Chen
9db1a37cc4 am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:25:43 -08:00
Eric Laurent
e77d408345 am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp

* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 18:39:17 -08:00
Ray Chen
6f762b2d84 am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-plus-aosp

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-01 17:08:54 -08:00
Eric Laurent
5e392e2b02 am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 17:04:24 -08:00
Ray Chen
d5fa58cf3d Fix timezone issue to comply with EXIF standard. 2009-11-30 14:39:08 -08:00
Ray Chen
0b6ee9fc5e DATE_TAKEN should be in millisecond instead of second. 2009-11-30 11:07:47 -08:00
Eric Laurent
55da000c1d am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:05:52 -08:00
Eric Laurent
524dc046b1 Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
2009-11-27 05:07:55 -08:00
Gloria Wang
03c185bf76 am c61b0de8: Merge change Id6ccc9bc into eclair-mr2
Merge commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa' into eclair-mr2-plus-aosp

* commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa':
  Update documentation: The width of the image for face detection must be even.
2009-11-25 13:46:30 -08:00
Gloria Wang
d6ccc9bcf0 Update documentation: The width of the image for face detection must be even. 2009-11-24 16:07:19 -08:00
Jean-Michel Trivi
15b0bd2e6e am 4eaf35b9: am a0e37e9d: Merge change I941136fd into eclair
Merge commit '4eaf35b99deb2abbb350383dd6458f1ea12e5bee' into eclair-mr2-plus-aosp

* commit '4eaf35b99deb2abbb350383dd6458f1ea12e5bee':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:32:25 -08:00
Jean-Michel Trivi
e78c72663e am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-plus-aosp

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:41 -08:00
Jean-Michel Trivi
4eaf35b99d am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:30 -08:00
Jean-Michel Trivi
941136fd08 Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
to define how the two new audio sources behave when used on devices
that don't support them.
2009-11-18 16:15:12 -08:00