summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* TIF: Replace explicit types with <>Jae Seo2015-06-055-24/+21
| | | | | | Also removed unnecessary boxing/unboxing Change-Id: I97ef6b7f369cac97a133180773be96463f2a813d
* TIF: Convert fields to local variablesJae Seo2015-06-051-4/+2
| | | | Change-Id: Ide6c5ad36229410f30f7929c6dd511945d48aa6f
* Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-devJae Seo2015-06-051-3/+6
|\
| * TIF: Add more explanation for notifyChannelRetunedJae Seo2015-06-051-3/+6
| | | | | | | | | | Bug: 21277081 Change-Id: Ia4de27bc0ecdf49bcad83cfcd396e8d55dc8343a
* | TIF: Remove unused importsJae Seo2015-06-051-4/+0
|/ | | | Change-Id: I1419a8e44d82fa009ccd6170d9048c3e24f51a2b
* Merge "TIF: Add sanitization code for the current position" into mnc-devDongwon Kang2015-06-051-0/+10
|\
| * TIF: Add sanitization code for the current positionDongwon Kang2015-06-041-0/+10
| | | | | | | | | | | | | | + More documentation on the currnet position Bug: 21573422 Change-Id: I51d184d03a61270d3ea36b36f880f1f052a99cd1
* | Merge "Ringtone: keep a reference until playback completion." into mnc-devEric Laurent2015-06-041-2/+38
|\ \
| * | Ringtone: keep a reference until playback completion.Eric Laurent2015-06-041-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | Keep a reference on active Ringtones to avoid garbage collection before playback is complete. Bug: 11366759. Change-Id: Icb04da427c20e0b4657e9e8b13b3ecab98e5a333
* | | Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into ↵Alan Viverette2015-06-041-23/+7
|\ \ \ | |_|/ |/| | | | | mnc-dev
| * | Prevent poorly-extended ParcelableSpans from writing to parcelsAlan Viverette2015-06-021-23/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | If a developer extends an existing ParcelableSpan and overwrites writeToParcel, TextUtils will crash when attempting to unparcel since the span type ID is not accurate. This CL makes a separate framework-private method for writeToParcel to ensure that even if a developer extends a ParcelableSpan class, they won't modify the parceling or unparceling code that's tied to the span type ID. Bug: 21274544 Change-Id: If4c3506a55999df7a3b6d87cb8d550235d7a02c6
* | Camera2: add high speed video APIsZhijun He2015-06-031-10/+14
| | | | | | | | | | | | | | Interface only. Bug: 21442271 Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
* | Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-devJeff Tinker2015-06-031-10/+12
|\ \
| * | Fix bug in MediaCrypto.setMediaDrmSessionJeff Tinker2015-06-011-10/+12
| | | | | | | | | | | | | | | | | | | | | MediaCryptoException was being thrown unexpectedly bug: 21565802 Change-Id: I44768cac1e85a01c8d775b8432d11711ae978b0d
* | | Merge "media Utils: remove parse integer logspam" into mnc-devRobert Shih2015-06-031-0/+3
|\ \ \
| * | | media Utils: remove parse integer logspamRobert Shih2015-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 21569707 Change-Id: I808ce760f55cf6aad8376bc7ca3b3c5a88cb6b01
* | | | Merge "Use config.xml parameters instead of System properties." into mnc-devArunesh Mishra2015-06-031-15/+6
|\ \ \ \
| * | | | Use config.xml parameters instead of System properties.Arunesh Mishra2015-06-021-15/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | For 'near-ultrasound' support (mic/speaker). Refer b/21072209 for details. Bug: 21072209 Change-Id: Id7131cd38288d74af8102487b2c6b03048b4ae3b
* | | | Fix calls to Rect.intersect(Rect)Doris Liu2015-06-021-1/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL checks for the return value for Rect.intersect(Rect) for whether there is actually an intersection before taking the calling rect as the intersection. In the case of no intersection (Rect.intersect(Rect) returns false), the calling rect would not have been changed, so here in this CL it will be manually set empty. Bug: 7368679 Change-Id: I7494c1a1649eca09e34412f0a59b795e8b3a82aa
* | | Merge "MediaPlayer: trigger onError instead of exception on stale native ↵Robert Shih2015-06-012-32/+18
|\ \ \ | | | | | | | | | | | | notifications" into mnc-dev
| * | | MediaPlayer: trigger onError instead of exception on stale native notificationsRobert Shih2015-06-012-32/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | This change also reverted commit 2c838fbd87ad5685c0008b419ea02421159b9b70, "MediaPlayer: add mPreparing to weed out unwanted prepared messages". Bug: 21266735 Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d
* | | Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-devMarco Nelissen2015-05-291-3/+22
|\ \ \
| * | | Update ExifInterface.getDateTime to support subsecondsMarco Nelissen2015-05-291-3/+22
| | |/ | |/| | | | | | | | | | | | | | | | Also document that it returns local time. Bug: 20638367 Change-Id: I6a1c35925e0555bcdcb079be0ca5b19a279a05a6
* | | Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-devAndy Hung2015-05-291-4/+85
|\ \ \
| * | | Clarify AudioFormat sample rate and encoding documentationAndy Hung2015-05-291-4/+85
| | | | | | | | | | | | | | | | | | | | Bug: 21476142 Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1
* | | | Merge "Send a message with data in MediaController.MessageHandler.post()" ↵Sungsoo Lim2015-05-291-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | into mnc-dev
| * | | | Send a message with data in MediaController.MessageHandler.post()Sungsoo Lim2015-05-281-1/+3
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 21478435 Change-Id: Ifd50b857c4503d39868540f6256c78f0cb510c83
* | | | Merge "Improve error handling for AudioTrack write with PTS" into mnc-devGlenn Kasten2015-05-291-1/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve error handling for AudioTrack write with PTSGlenn Kasten2015-05-271-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Pick up some of the error handling from AudioTrack write ByteBuffer Change-Id: I62f233c2026759dbe57d7e1f48d62babaa49e5b8
* | | | Merge "Deprecations are warnings not errors" into mnc-devGlenn Kasten2015-05-283-3/+3
|\ \ \ \
| * | | | Deprecations are warnings not errorsGlenn Kasten2015-05-283-3/+3
| |/ / / | | | | | | | | | | | | Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
* | | | Merge "Add comments to indicate code review was done for bugs" into mnc-devGlenn Kasten2015-05-281-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Add comments to indicate code review was done for bugsGlenn Kasten2015-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 20818955 Bug: 20890069 Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
* | | | Merge "Handle unknown duration in playMediaSamples test" into mnc-devMarco Nelissen2015-05-271-7/+14
|\ \ \ \
| * | | | Handle unknown duration in playMediaSamples testMarco Nelissen2015-05-271-7/+14
| | |/ / | |/| | | | | | | | | | | | | | Bug: 21391417 Change-Id: I85d8f5921e8423da078acfe3aff34a6fcef69e78
* | | | Merge "MediaCodec: unhide mime type for EAC3" into mnc-devChong Zhang2015-05-271-3/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | MediaCodec: unhide mime type for EAC3Chong Zhang2015-05-271-3/+0
| |/ / | | | | | | | | | | | | bug: 18723951 Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
* | | media: Update MediaCodec class descriptionLajos Molnar2015-05-261-206/+1310
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11990465 Bug: 11019199 Bug: 11990564 Bug: 10672559 Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995
* | | Remove temporary javadoc for android.media.AudioFormatJean-Michel Trivi2015-05-261-2/+3
|/ / | | | | | | | | | | | | Remove temporary text in javadoc for AudioFormat. Start javadoc for encoding. Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d
* | Merge "More android.media.AudioFormat javadoc" into mnc-devJean-Michel Trivi2015-05-231-5/+115
|\ \
| * | More android.media.AudioFormat javadocJean-Michel Trivi2015-05-221-5/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | More doc about AudioFormat constants, use of the builder, sample rate, channel masks (position vs index, examples) Bug 20921159 Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d
* | | Merge "ImageReader: Register estimated native allocation" into mnc-devChien-Yu Chen2015-05-222-0/+70
|\ \ \
| * | | ImageReader: Register estimated native allocationChien-Yu Chen2015-05-222-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Estimate the native allocation and register it so it can be accounted for during GC. Bug: 20299272 Change-Id: I43af3058b6fe9a41e5e7e119e390ed079402c4b8
* | | | Doc update for MediaDrm's OnExpirationUpdate methodJeff Tinker2015-05-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on EME spec clarification that expiration time of 0 means unlimited. bug: 21393975 Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222
* | | | Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" ↵Robert Shih2015-05-222-3/+32
|\ \ \ \ | |_|/ / |/| | | | | | | into mnc-dev
| * | | MediaPlayer: add mPreparing to weed out unwanted prepared messagesRobert Shih2015-05-212-3/+32
| | | | | | | | | | | | | | | | | | | | Bug: 21266735 Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
* | | | Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-devJean-Michel Trivi2015-05-211-3/+12
|\ \ \ \
| * | | | Extra for ACTION_RINGTONE_PICKER for AudioAttributes flagsJean-Michel Trivi2015-05-201-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying AudioAttributes flags that will be used when playing the Ringtone. Bug 19407114 Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
* | | | | Merge "Fix reading attributes for playback restrictions" into mnc-devJean-Michel Trivi2015-05-213-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fix reading attributes for playback restrictionsJean-Michel Trivi2015-05-203-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playback restrictions can be lifted with the correct flag, FLAG_BYPASS_INTERRUPTION_POLICY, but this flag is for the system only. As such, it must be read by querying "all the flags" with AudioAttributes.getAllFlags() which is a system API which returns all the system flags. getFlags() only returns the public SDK flags. Bug 19407114 Change-Id: I22dadfaf5d1b48b3c0754e1e6af00b734d790fec