summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE) ExifInterface: Close the file when an exception happensSungsoo2016-12-121-1/+3
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-0/+7
|\
| * DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before ch...Sungsoo2016-09-271-0/+7
* | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-072-178/+2239
|\ \ | |/
| * DO NOT MERGE: Fix CTS regressionSungsoo Lim2016-08-011-4/+4
| * DO NOT MERGE: Remove the use of JHEAD in ExifInterfaceSungsoo Lim2016-07-212-178/+2239
* | media:Modify the display of system default ringtone when it is none.kaiyiz2016-07-051-0/+5
* | Remove TONE_SUPERVISORY_CHSandeep Kunta2016-07-021-6/+0
* | Remove use of '_' variable nameNeil Fuller2016-07-011-2/+2
* | MediaScanner: Add support for default ringtones per simDanesh M2016-05-141-13/+66
* | Add hotword AudioService null checkMatt Garnes2016-05-111-1/+8
* | media: Remove effect session callbacks from the frameworkSteve Kondik2016-04-271-51/+0
* | Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStopJimmy Dalqvist2016-04-141-3/+9
* | media: Add flags, channelMask, and UID to audio session callbacksSteve Kondik2016-04-081-3/+4
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-112-33/+68
|\ \
| * | Fix race condition when setting default ringtonesMarco Nelissen2016-01-121-30/+65
| * | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread a...Andy Hung2015-12-032-16/+29
| |\ \
| | * \ DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread a...Andy Hung2015-12-032-16/+29
| | |\ \
| | | * \ DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-032-16/+29
| | | |\ \
| | | | * | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-022-16/+29
| * | | | | DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on proper...Chris Elliott2015-12-021-8/+0
| |/ / / /
| * | | | MediaPlayer: Disable acquiring wakelocks based on property.Sridhar Vashist2015-11-231-0/+8
| * | | | Merge "Revert "Fix race condition when setting default ringtones"" into mnc-d...Ian Pedowitz2015-11-111-61/+28
| |\ \ \ \ | | |/ / /
| | * | | Revert "Fix race condition when setting default ringtones"Ian Pedowitz2015-11-111-61/+28
| * | | | Merge "Fix race condition when setting default ringtones" into mnc-dr-devMarco Nelissen2015-11-091-28/+61
| |\ \ \ \ | | |/ / /
| | * | | Fix race condition when setting default ringtonesMarco Nelissen2015-11-061-28/+61
| * | | | am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comme...Wei Jia2015-10-131-5/+0
| |\ \ \ \ | | |/ / /
| * | | | am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik...Phil Burk2015-10-131-1/+9
| |\ \ \ \
| * \ \ \ \ am 977fe03b: BLE-MIDI: change binding for BluetoothMidiServicePhil Burk2015-10-134-10/+44
| |\ \ \ \ \
| * \ \ \ \ \ am c024de3c: media: ignore null InputStreamRonghua Wu2015-10-131-4/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc...Eric Laurent2015-10-131-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-devPhil Burk2015-10-121-1/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am e39def48: MidiService: update listener with current status when registeredPhil Burk2015-10-121-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-devChien-Yu Chen2015-10-071-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()Eric Laurent2015-08-272-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix AudioAttributes.usageToString() string return valuesZach Johnson2015-08-251-3/+3
* | | | | | | | | | | | audiosystem: Add API for listening to effect session eventsSteve Kondik2016-03-081-0/+50
* | | | | | | | | | | | Merge tag 'android-6.0.1_r13' into HEADJessica Wagantall2016-02-012-16/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-102-16/+29
* | | | | | | | | | | | frameworks/base: Adjust the index of LHR tonesKarthik Reddy Katta2016-01-231-1/+1
* | | | | | | | | | | | frameworks/base: Added SD type supportParamananda Pradhan2016-01-231-1/+3
* | | | | | | | | | | | Ringtone: Add support for selection of phone ringtone for SIM-2.Karthik Reddy Katta2016-01-122-7/+116
* | | | | | | | | | | | media: Configure audio encode parameters only for valid audio codec.Alok Kediya2016-01-041-1/+1
* | | | | | | | | | | | Fix filedescriptor leakage in MediaMetadataRetrieverharvey_tsai2015-12-191-9/+1
* | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-071-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Revert "Fix race condition when setting default ringtones"Ian Pedowitz2015-11-111-61/+28
| * | | | | | | | | | | Fix race condition when setting default ringtonesMarco Nelissen2015-11-091-28/+61
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | MediaPlayer: remove obsolete function setPlaybackRate from comments.Wei Jia2015-10-131-5/+0
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr...Phil Burk2015-10-131-1/+9
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | BluetoothMidiDevice: change write type to support JamStikPhil Burk2015-10-121-1/+9
| | | |_|_|_|/ / / | | |/| | | | | |