summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Dont store video genre metadata as audio genre in MediaScannerHiroshi Iwata2010-11-211-1/+1
| | | | | | | | | | MediaScanner mistake Video_ID for Auido_ID when MediaScanner register genre of mp4 video content that this content have genre data. Add an explicit check for audio. Change-Id: Ic27638e9e59af44e388a8c38d774a077f23520b7
* Prevent MediaScanner from removing Micro thumbnail database after scan.Mattias Brodda2010-11-211-7/+9
| | | | | | | | | | | After scanning the sdcard for the first time, the MediaScanner deletes the micro thumbnail database files. The MiniThumbFile class attempts to recreate the files but ends up with 0-sized db-files that it cannot store any more micro thumbs in, resulting in that all micro thumbnails that are results from thumbnail request are never stored properly until the device is restarted. Change-Id: I2b49580ae3360447525dbee80f6ba15b4bc658dd
* Add selection of silent mode with volume control.Eran2010-10-171-7/+27
| | | | | | | | | | Allows volume buttons to control "silent <-> vibrate <-> volume", when the appropriate setting is enabled. Patch by Alex Hofbauer. Original patch and small fix by Eran Mizrahi. Change-Id: Iaec151e24c07129406ab7ce003cdccd409dffed7
* support FM Radio audio routing in audio flingerxinyu2010-10-124-4/+14
|
* Prevent MediaScanner from removing Micro thumbnail database after scan.Mattias Brodda2010-09-082-5/+36
| | | | | | | | | | | After scanning the sdcard for the first time, the MediaScanner deletes the micro thumbnail database files. The MiniThumbFile class attempts to recreate the files but ends up with 0-sized db-files that it cannot store any more micro thumbs in, resulting in that all micro thumbnails that are results from thumbnail request are never stored properly until the device is restarted. Change-Id: I2b49580ae3360447525dbee80f6ba15b4bc658dd
* camera: Add autofocus support to the media recorderSteve Kondik2010-09-061-0/+2
|
* Fix setStreamTyp not workingJonas Larsson2010-08-161-3/+1
| | | | | Breakage caused by previous commit. This also fixes the leakage that commit was intended to fix.
* Merge branch 'froyo' of ↵Steve Kondik2010-08-091-1/+1
|\ | | | | | | | | | | | | git://android.git.kernel.org/platform/frameworks/base into froyo Conflicts: services/java/com/android/server/PowerManagerService.java
| * fix doc bugsScott Main2010-08-041-1/+1
| | | | | | | | Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
| * Fix issue 2811538: System server crash when disconnecting BT headset after ↵Eric Laurent2010-07-011-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using SCO off call. Problem: When the bluetooth device is removed, the AudioService clears all active SCO connections and unlinks from the client application's binder interface death. The problem is that the unlinking is done even if no more connections are active for a given client, which throws a runtime exception that is not catched causing the system server to crash. The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of active SCO connections for this client is not 0. The NoSuchElementException exception is also catched when calling unlinkToDeath() Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
* | libmedia: Add support to set camera parametersMohan Kandra2010-08-051-0/+3
| | | | | | | | Change-Id: I0af0790c9499e983fc21f20985f591eeeaca744c
* | frameworks/base: Fix for no sound output issue in preview ringtone.Mahesh Kumar2010-07-261-0/+3
| | | | | | | | | | | | | | | | | | | | - When you repeatedly adjust volume up/down in preview ringtone, sound output is lost. Mediaplayer instaces are created and are not released correcly which causes this issue. Fixed the issue by adding a check before creating any new Mediaplayer instance. Change-Id: I794d29839501a93d0a42463435e50078fea93ab5 CRs-fixed: 245668
* | media: Unhide AAC encoderSteve Kondik2010-07-251-1/+1
| |
* | Unhide encoder profiles, add "front" profile.Steve Kondik2010-07-252-3/+6
| |
* | Fix issue 2811538: System server crash when disconnecting BT headset after ↵Eric Laurent2010-07-221-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using SCO off call. Problem: When the bluetooth device is removed, the AudioService clears all active SCO connections and unlinks from the client application's binder interface death. The problem is that the unlinking is done even if no more connections are active for a given client, which throws a runtime exception that is not catched causing the system server to crash. The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of active SCO connections for this client is not 0. The NoSuchElementException exception is also catched when calling unlinkToDeath() Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
* | Add adjustable haptic feedback stuffMichael Webster2010-07-071-0/+7
| |
* | Add FLAC support to the media frameworkKenny Root2010-06-231-1/+3
|/ | | | | | | | FLAC support is based on Xiph's libFLAC reference library. It only supports 16-bit and 8-bit decoding. 24-bit to 16-bit dithering is not implemented. Change-Id: I1ad65abc29dd2b8446eda8349d3239d3119b8dc7
* Fix a Javadoc to clarify when setAudioStreamType() should be called.James Dong2010-06-031-2/+6
| | | | | | bug - 2737926 Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
* Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-111-0/+2
|\
| * Hide two audio focus methods.Xavier Ducrohet2010-05-111-0/+2
| | | | | | | | Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
* | Don't clear the _data column in the audio_meta table, since it isn'tMarco Nelissen2010-05-111-2/+5
|/ | | | | | | needed, and causes a sqlite constraint exception. Bug 2671792. Change-Id: Ie6e5d0369c3750739fa155e651be4d87c016a41f
* Update javadoc in android.media.AudioManager to not hide theJean-Michel Trivi2010-05-111-9/+15
| | | | | | registerAudioFocusListener() methods. Change-Id: I8df37bd89df6f492aeb70fa636200552140578f9
* Fix bug 2670395 and 2599698Jean-Michel Trivi2010-05-112-22/+25
| | | | | | | | | | | | | | | | | | | | | | | When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug 2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called. Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
* Fix bug 2619062 Music is routed to Phone speaker, though it isJean-Michel Trivi2010-04-231-2/+17
| | | | | | | | | | connected to A2DP media profile When the phone is docked and using the dock A2DP, and the user connects another A2DP device, make the dock unavailable immediately before connecting the new A2DP device. Change-Id: I82d53836fb509ee4ea7cdb68f467dfb946c634f8
* Update AudioService to reflect phone state changes with AudioFocus.Jean-Michel Trivi2010-04-201-29/+52
| | | | | | | | | | | | | | Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot request audio focus (request is denied). Because the phone state is now mostly handled like a new client, there is no need monitor mode changes and to keep track of undispatched focus changes, as those will delayed focus gains will now automatically happen at the end of the call when the phone client is removed from the focus stack. Change-Id: I11ff73b015ab93f07040755fd8ee75c8d675e025
* Merge "When updating existing entries in the media database, don't update ↵Marco Nelissen2010-04-201-2/+6
|\ | | | | | | the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo
| * When updating existing entries in the media database, don't updateMarco Nelissen2010-04-201-2/+6
| | | | | | | | | | | | | | the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2
* | Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem occurs if the device is powered down in silent mode. When the device restarts, AudioService reads current ringer mode from saved settings but does not call setRingerModeInt() to perform actions required when ringer mode changes. The volumes of streams affected by ringer mode are actually at 0 because they are also read from settings but their mute state is not applied correclty. When we later exit from silent mode, the streams other than STREAM_RING that are affected by ringer mode are not restored as they are not considered muted. This applies to STREAM_SYSTEM but also to STREAM_NOTIFICATION if its volume is controlled independently from STREAM_RING. The fix consists in calling setRingerModeInt() when AudioService starts. Change-Id: Ica75b9874938dda1bc1b634c3e97db4a650d295c
* | Fix issue 2604270 Device auto connects to Car Dock (Media profile) after ↵Eric Laurent2010-04-201-0/+3
|/ | | | | | | | | | | | | | | | | undocking. There was a regression introduced by change 4c637b9e34f4c8db69a64ad21a4e2bcfa7485b5f fixing issue 2578813. As the A2DP device disconnection is notified to the audio policy manager after a delay, there is a period during which the A2DP device is actually not connected but the A2DP output is considered present by audio framework. If a playback is started during this period, The A2DP output requests the activation of the A2DP sink which in turn triggers a reconnection of the A2DP sink. The fix consists in suspending the A2DP output immediately when receiving the A2DP disconnection intent so that any activity on A2DP output is ignored until the output is actually closed by the audio policy manager. Change-Id: I16eaace45e12bfc970f50836b46a73b756b493f0
* Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in ↵Eric Laurent2010-04-141-17/+9
| | | | | | | | | | | | | | | | | | silent mode. This is a regression introduced by change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 for issue 2472495. When AudioService changes audio mode, setMode() reapplies current volume for the default active stream which in this case is STREAM_RING. Because the new implementation of silent mode actually mutes the ringer stream, setStreamVolumeInt() now applies the volume change received while in silent mode to the last audible value and we end up clearing the last audible volume for ringer. The fix consists in not modifying last audible value when the new value is 0. Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt() in change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7. Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
* Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.Eric Laurent2010-04-141-0/+3
| | | | | | | | | | | | | The problem happens only if volume down key is pressed while already in silent or vibrate mode. In this case, AudioService accepts changing the last audible index for ringer volume from 1 to 0. When volume up is pressed, current ringer volume value is restored from 0 instead of 1. The fix consists in keeping last audible index at 1 once in silent of vibrate mode even is volume down key is pressed. Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
* Fix bug 2578813 Delay pausing music and routing audio for car docksJean-Michel Trivi2010-04-131-11/+56
| | | | | | | | | | | | | Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService to AudioService. Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP device. Disconnect from A2DP docks with a delay to handle transient disconnections. Cancel delayed A2DP disconnections when connecting to a dock as this can be a reconnection after a transient disconnection. Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
* Honor the "Never vibrate" setting for incoming calls.Daniel Sandler2010-04-131-4/+2
| | | | | Bug: 2579295 Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
* Fix monkey bug 2586534 java.util.ConcurrentModificationExceptionJean-Michel Trivi2010-04-091-2/+6
| | | | | | | | Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this. Change-Id: I5ada574e4e163fa95da9dad2fefe610b48303320
* Per requested by API council, rename ↵Ray Chen2010-04-071-30/+30
| | | | | | | | MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
* Make createVideoThumbnail and createImageThumbnail look consistent.Ray Chen2010-04-051-128/+43
| | | | Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
* Fix bug 2565463 Ensure an object cannot appear twice in theJean-Michel Trivi2010-04-012-1/+9
| | | | | | | | AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver() Change-Id: Iedd6081a2a096bd7effbaeb9f888a31691201b3b
* Public API changes for CameraProfile and CamcorderProfile classesJames Dong2010-04-013-59/+109
| | | | | | | | | | | | 1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final” 2. CamcorderProfile.Quality: use an int rather than an enum 3. Add API on MediaRecorder to pass in a CamcorderProfile 4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile 5. Remove a convenient method and instead let the (mms) app do that task bug - 2553862 Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
* Fix bug 2553575 API REVIEW: android.media Change 1 of 3Jean-Michel Trivi2010-03-311-8/+8
| | | | | | | Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange Change-Id: I8296cc84381506dabe8a9ceb1b5e3c0ab6d4af25
* Fix issue 2472495: Phone cannot be set to silent mode via volume keys while ↵Eric Laurent2010-03-221-49/+88
| | | | | | | | | | | | | | | | | Driveabout is taking. The problem is that AudioService.adjustStreamVolume() only handles the ringer mode change when the STREAM_RING volume changes from 1 to 0 or 0 to 1. If another stream is soloed, the STREAM_RING stream volume is forced to 0 and then never transits from 0 to 0 when volume down key is pressed. The fix consists in considering the saved value instead of current value when ajusting or setting the volume of a muted stream: only the saved value is adjusted too, leaving the stream muted but updating the value that will be restored when it will be unmuted. Also changed implementation of stream volume control by setRingerModeInt() to use stream mute feature instead of direct volume control. Change-Id: Id85d76450b36d61a0fe8195eb4bffe63ffbd427c
* Unhide the MediaButton receiver API in android.media.AudioManagerJean-Michel Trivi2010-03-221-27/+0
| | | | Change-Id: Ic9222b0bf6e2ff481c6aa5f16ac0259fa7a52355
* Update MediaRecorder.java documentation to mention it does not work on the ↵James Dong2010-03-221-0/+1
| | | | | | | | emulator yet. bug - 2532726 Change-Id: If6dbf0d89c4681a647419e1911213a4c22dc3dab
* Merge "Fix two AudioFocus issues: - if a focus owner abandons audio focus ↵Jean-Michel Trivi2010-03-191-15/+52
|\ | | | | | | during a call, the next focus owner in the stack was never notified - if a focus owner requests the focus while alread owning it, and the type of focus request changes, the previous focus owner was not notified that the type of focus loss had changed."
| * Fix two AudioFocus issues:Jean-Michel Trivi2010-03-191-15/+52
| | | | | | | | | | | | | | | | | | | | - if a focus owner abandons audio focus during a call, the next focus owner in the stack was never notified - if a focus owner requests the focus while alread owning it, and the type of focus request changes, the previous focus owner was not notified that the type of focus loss had changed. Change-Id: Iee6c6e17bcdd3c225a4b600f40ba434294870f17
* | Unhide new constants used in AudioFocus API to denote a situationJean-Michel Trivi2010-03-191-9/+11
|/ | | | | | | where a new focus owner signals it allows other audio apps to keep playing by ducking their audio streams. Change-Id: I1109f44546f3cbcff8ad33ee21cfff50f4f12177
* Merge "We should pass null for the album artist if it was not set, instead ↵Marco Nelissen2010-03-191-6/+6
|\ | | | | | | of a copy of the artist, since the media provider needs to know whether the album artist was actually set."
| * We should pass null for the album artist if it was not set, instead of a copyMarco Nelissen2010-03-191-6/+6
| | | | | | | | | | | | | | of the artist, since the media provider needs to know whether the album artist was actually set. Change-Id: I29b885c8293609299a55babadf9ca2a30e20e5bd
* | Fix SDK build Remove links to hidden constant in javadoc.Jean-Michel Trivi2010-03-181-3/+0
| | | | | | | | Change-Id: I21495f0ef64b3dc154ce0e0ca2d44686afd752e9
* | Attempt to fix the SDK build.Eric Laurent2010-03-181-1/+1
| | | | | | | | Change-Id: I024df1b513da117057a21c27e6c0cd134cdd8023
* | Support focus requests where ducking of the loser of audio focusJean-Michel Trivi2010-03-182-30/+43
| | | | | | | | | | | | is acceptable for the new audio focus owner. Change-Id: I965483f12eeb717115a8f6992d8f1ab7fafa4e45