summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE) ExifInterface: Close the file when an exception happensSungsoo2016-12-121-1/+3
| | | | | | | | CYNGNOS-3312 Bug: 32068647, Bug: 30936376 Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f (cherry picked from commit cb17930077de640411407636eebc000e2d06dd9c) (cherry picked from commit 2c79cada8897dcb171b8227b4ea91c292400702f)
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-0/+7
|\ | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74
| * DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before ↵Sungsoo2016-09-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | change ExifInterface object can be created with a unsupported file format. If saveAttribute is called with an unsupported file format, ExifInterface makes the file corrupted. This CL prevents those cases by throwing an exception before making any change on the file. Bug: 30936376 Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6 (cherry picked from commit 2ee53c82cc8c8b2e76a19910074672f6204a5d63)
* | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-072-178/+2239
|\ \ | |/ | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:45 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * DO NOT MERGE: Fix CTS regressionSungsoo Lim2016-08-011-4/+4
| | | | | | | | | | Bug: 30297223, Bug: 30437363 Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
| * DO NOT MERGE: Remove the use of JHEAD in ExifInterfaceSungsoo Lim2016-07-212-178/+2239
| | | | | | | | | | Bug: 29270469 Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
* | media:Modify the display of system default ringtone when it is none.kaiyiz2016-07-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | After we set the sound of calender use the default ringtone , if the system default ringtone is none, the sound of calender will show unknown ringtone. Make sound of calender not show unknown ringtone when the system default ringtone is none. CYNGNOS-3160 CRs-fixed: 812323 Change-Id: Idbc488748a81b88bb7a0df49e25d6a8cf6ba3826
* | Remove TONE_SUPERVISORY_CHSandeep Kunta2016-07-021-6/+0
| | | | | | | | | | | | | | Remove TONE_SUPERVISORY_CH, since its no longer used. Change-Id: Idd1c5e4cab878362975cb3fb38332e39276a2a6b CRs-Fixed: 967597
* | Remove use of '_' variable nameNeil Fuller2016-07-011-2/+2
| | | | | | | | | | | | | | | | | | '_' may become invalid in future versions of the Java language and generates warnings in OpenJDK 8. Bug: 24494019 Change-Id: Id77c8f003b0fdf295191d2d8dbd5b0b0edde2b44
* | MediaScanner: Add support for default ringtones per simDanesh M2016-05-141-13/+66
| | | | | | | | | | Ticket: CYNGNOS-314, CYNGNOS-2654 Change-Id: I1ed112a38d2b3676e31a78eb70ea0e16a3957b02
* | Add hotword AudioService null checkMatt Garnes2016-05-111-1/+8
| | | | | | | | | | | | | | | | | | | | If an application tries to start recording with the HOTWORD input before AudioService is ready, the interface is not available to call handleHotwordInput on. Check for null and only log if AudioService is not available. Change-Id: I2e693c5aed7cdce6299d8ff16341c1af8dd5b54f Issue-Id: FOR-257
* | media: Remove effect session callbacks from the frameworkSteve Kondik2016-04-271-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * This API is moving to CMSDK. Revert "media: Add flags, channelMask, and UID to audio session callbacks" This reverts commit e0554d493e870ea5e323ed06f54becb93c19fa04. Revert "audiosystem: Add API for listening to effect session events" This reverts commit 9957394df71db6f01802091858216582c58eab67. Change-Id: I5f18fdb3390db25285a5b819dfe2136ae111c0b3
* | Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStopJimmy Dalqvist2016-04-141-3/+9
| | | | | | | | | | | | | | | | | | | | | | When calling AudioTrack.stop the system needs some time to stop the audiotrack and set the position to 0. The current sleep time of 100ms is not enough. Update the test to use the same strategy as the CTS test, which is to call getPlaybackHeadPosition multiple time before giving up and failing the test. Change-Id: Ie938929c009c41e101782b4a46ac01a0aa73ee34
* | media: Add flags, channelMask, and UID to audio session callbacksSteve Kondik2016-04-081-3/+4
| | | | | | | | | | | | | | * This is to allow us to implement more sophisticated logic in the application on when to apply effects to a stream. Change-Id: I2931daa1546591e18d98acc91775c1fdafa3d453
* | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-112-33/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * | Fix race condition when setting default ringtonesMarco Nelissen2016-01-121-30/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the device was powered off during first boot, after media scanner inserted some entries but before the default ringtone settings were set (or committed to disk), the default settings would not be set on subsequent boots. Bug: 18625739 Bug: 22349910 Bug: 25633323 Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
| * | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread ↵Andy Hung2015-12-032-16/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0a887bcd5c am: 7c798c13a7 am: 94cefd6adb * commit '94cefd6adb7cf464e4765faaba001071b543517b': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
| | * \ DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread ↵Andy Hung2015-12-032-16/+29
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0a887bcd5c am: 7c798c13a7 * commit '7c798c13a7c36f3c8877f410ecf5552e1b385805': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
| | | * \ DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-032-16/+29
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0a887bcd5c * commit '0a887bcd5c5a8056735d221ad71afcff1f6eb1a6': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
| | | | * | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-022-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample decoding still occurs in SoundPoolThread without holding the SoundPool lock. Bug: 25781119 Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8 (cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
| * | | | | DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on ↵Chris Elliott2015-12-021-8/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | property." This reverts commit f60491183def4c46b4026afb4648544e7289ea5f.
| * | | | MediaPlayer: Disable acquiring wakelocks based on property.Sridhar Vashist2015-11-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore setWakeMode based on system property. Wakelocks essential for playback will be held by audioflinger. Change-Id: I413cd873bf21e1e999dbf89a27802fbe1b6022c7 Signed-off-by: Sridhar Vashist <svashist@motorola.com>
| * | | | Merge "Revert "Fix race condition when setting default ringtones"" into ↵Ian Pedowitz2015-11-111-61/+28
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 88d4cc1001 * commit '88d4cc100175a54be3b7d560a91c38197f59f4bf': Revert "Fix race condition when setting default ringtones"
| | * | | Revert "Fix race condition when setting default ringtones"Ian Pedowitz2015-11-111-61/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74. Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
| * | | | Merge "Fix race condition when setting default ringtones" into mnc-dr-devMarco Nelissen2015-11-091-28/+61
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | am: 83702ec3ed * commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff': Fix race condition when setting default ringtones
| | * | | Fix race condition when setting default ringtonesMarco Nelissen2015-11-061-28/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the device was powered off during first boot, after media scanner inserted some entries but before the default ringtone settings were set (or committed to disk), the default settings would not be set on subsequent boots. Bug: 18625739 Bug: 22349910 Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
| * | | | am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from ↵Wei Jia2015-10-131-5/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | comments. * commit 'de612dc1d10d25e017ac911d0e7cca6709bdbb96': MediaPlayer: remove obsolete function setPlaybackRate from comments.
| * | | | am 8e82755d: Merge "BluetoothMidiDevice: change write type to support ↵Phil Burk2015-10-131-1/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JamStik" into mnc-dr-dev * commit '8e82755dfdfee837cb73d3db3f6319301d2a5903': BluetoothMidiDevice: change write type to support JamStik
| * \ \ \ \ am 977fe03b: BLE-MIDI: change binding for BluetoothMidiServicePhil Burk2015-10-134-10/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '977fe03b36a7783f9cee8497efe550a69b128473': BLE-MIDI: change binding for BluetoothMidiService
| * \ \ \ \ \ am c024de3c: media: ignore null InputStreamRonghua Wu2015-10-131-4/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c024de3c946c18e8e4799eb8d372fdec3146f8cf': media: ignore null InputStream
| * \ \ \ \ \ \ am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into ↵Eric Laurent2015-10-131-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'c1c462cbaa8b65c6240f947de503619482296222': MidiBluetoothService: add new device to HashMap
| * \ \ \ \ \ \ \ am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-devPhil Burk2015-10-121-1/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca296978e7f2a1f70b8dca32b1db9372c2392458': MidiManager: fix double BTLE callback
| * \ \ \ \ \ \ \ \ am e39def48: MidiService: update listener with current status when registeredPhil Burk2015-10-121-0/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e39def480fd2d1bcc3a89751dd492d4634c38194': MidiService: update listener with current status when registered
| * \ \ \ \ \ \ \ \ \ am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-devChien-Yu Chen2015-10-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab7812750bca947abc9e8b1ce73a3041dbc2f2a9': MediaActionSound: Fix video stop sound
| * \ \ \ \ \ \ \ \ \ \ am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()Eric Laurent2015-08-272-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aef51d09ef33eb3f03789c71edc25a7b103728d1': AudioTrack: error reporting for getTimestamp()
| * | | | | | | | | | | Fix AudioAttributes.usageToString() string return valuesZach Johnson2015-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75642d043d647c921259dad20df504dd2e551644
* | | | | | | | | | | | audiosystem: Add API for listening to effect session eventsSteve Kondik2016-03-081-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This API will allow attaching a global listener which will notify the application when audio effect sessions are attached or removed on a stream. This requires that the policy is configured to automatically attach a set of effects. Change-Id: Iaf1ca133765045322b005d4148e2c4e86a9c3913
* | | | | | | | | | | | Merge tag 'android-6.0.1_r13' into HEADJessica Wagantall2016-02-012-16/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 release 13 Ticket: CYNGNOS-1522 Change-Id: Ie3e371fbd0ad24e99bba8512080b5238eeacb95e
| * | | | | | | | | | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-102-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample decoding still occurs in SoundPoolThread without holding the SoundPool lock. Bug: 25781119 Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8 (cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
* | | | | | | | | | | | frameworks/base: Adjust the index of LHR tonesKarthik Reddy Katta2016-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the index of Local Hold Recall tone types as per their sequence in tone_type array of ToneManager. Change-Id: I13d1d30a2fa468d750754f09d02912cfd90cb38a
* | | | | | | | | | | | frameworks/base: Added SD type supportParamananda Pradhan2016-01-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added DRM SD type "application/vnd.oma.drm.content" as a supportable DRM media type. CRs-Fixed: 941545 Change-Id: I7c53a3577a2044fb2d83ee7de3a7f1a3e625412e
* | | | | | | | | | | | Ringtone: Add support for selection of phone ringtone for SIM-2.Karthik Reddy Katta2016-01-122-7/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Issue: "The process android.process.media has stopped" pop up is displayed when ringtone for SIM-2 is selected. -Rootcause: There is no type and URI defined for SIM-2 ringtone in the RingtoneManager. This is leading to SQl exception when executing a selection query. -Fix: Add URIs for the SIM-2 and SIM-3 ringtones. Define interfaces to return them to app side based on subscription ID. TICKET: CYNGNOS-1589 CRs-Fixed: 612945 Change-Id: If68c2d008dd86d2b55d3fb7f5667bbadc238d0b3
* | | | | | | | | | | | media: Configure audio encode parameters only for valid audio codec.Alok Kediya2016-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added extra check for audio codec in profile (Cherrypicked from commit eed39d0053dee6649424867418e511b918b3c634) Cherry-picked to CM-13.0 to fix crash recording HFR video. Change-Id: Ie1ac5252e3d544ce61af2b3ae5080ec9c6966e44
* | | | | | | | | | | | Fix filedescriptor leakage in MediaMetadataRetrieverharvey_tsai2015-12-191-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setDataSource(String) throws an IllegalArgumentException when an IOException or FileNotFoundException occurs, but doesn't close FileDescriptor accordingly. Change-Id: Ib6e0f1418afeeb19e03abd4bedb4cc845a58b6b4
* | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 3 Change-Id: I59b9e5a943e0860d43bcfb36ee0e8b8b072412ea
| * | | | | | | | | | | Revert "Fix race condition when setting default ringtones"Ian Pedowitz2015-11-111-61/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74. Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
| * | | | | | | | | | | Fix race condition when setting default ringtonesMarco Nelissen2015-11-091-28/+61
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the device was powered off during first boot, after media scanner inserted some entries but before the default ringtone settings were set (or committed to disk), the default settings would not be set on subsequent boots. Bug: 18625739 Bug: 22349910 Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
| * | | | | | | | | | MediaPlayer: remove obsolete function setPlaybackRate from comments.Wei Jia2015-10-131-5/+0
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24260668 Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332 (cherry picked from commit cd860ac06ca7a46e9638dd741ba731f066705eb5)
| * | | | | | | | | Merge "BluetoothMidiDevice: change write type to support JamStik" into ↵Phil Burk2015-10-131-1/+9
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | mnc-dr-dev
| | * | | | | | | | BluetoothMidiDevice: change write type to support JamStikPhil Burk2015-10-121-1/+9
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily use a Request instead of a Command so that the JamStik will be properly enabled. Bug: 24207964 Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9 Signed-off-by: Phil Burk <philburk@google.com> (cherry picked from commit 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
generated by cgit v1.1 at 2024-10-31 23:59:34 +0000