summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* MidiManager: proxy all requests to open devices through MidiServiceMike Lockwood2015-06-0410-108/+140
* 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
* | 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
* | | 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
| |/ /
* | | media: Update MediaCodec class descriptionLajos Molnar2015-05-261-206/+1310
* | | Remove temporary javadoc for android.media.AudioFormatJean-Michel Trivi2015-05-261-2/+3
|/ /
* | 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
* | | 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
* | | | Doc update for MediaDrm's OnExpirationUpdate methodJeff Tinker2015-05-221-1/+2
* | | | Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" in...Robert Shih2015-05-222-3/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | MediaPlayer: add mPreparing to weed out unwanted prepared messagesRobert Shih2015-05-212-3/+32
* | | | 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
* | | | | 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
* | | | | Merge "AudioService: indicate system ready to AudioFlinger" into mnc-devEric Laurent2015-05-211-0/+1
|\ \ \ \ \
| * | | | | AudioService: indicate system ready to AudioFlingerEric Laurent2015-05-201-0/+1
* | | | | | Merge "Fix docs to not refer to non-public classes." into mnc-devChet Haase2015-05-211-3/+1
|\ \ \ \ \ \
| * | | | | | Fix docs to not refer to non-public classes.Chet Haase2015-05-201-3/+1
* | | | | | | Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-devAndy Hung2015-05-203-15/+31
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix AudioTrack, AudioRecord, AudioFormat APIAndy Hung2015-05-203-15/+31
* | | | | | | Merge "AudioFormat: more compressed formats" into mnc-devEric Laurent2015-05-203-3/+67
|\ \ \ \ \ \ \
| * | | | | | | AudioFormat: more compressed formatsEric Laurent2015-05-193-3/+67
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Updating (and completing) documentation post API-council changes." int...Paul McLean2015-05-204-26/+88
|\ \ \ \ \ \ \
| * | | | | | | Updating (and completing) documentation post API-council changes.Paul McLean2015-05-204-26/+88
* | | | | | | | TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()Dongwon Kang2015-05-201-4/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge "API for converting AudioAttributes to stream type" into mnc-devJean-Michel Trivi2015-05-191-5/+40
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | API for converting AudioAttributes to stream typeJean-Michel Trivi2015-05-191-5/+40
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Explain the void send() throws IOException" into mnc-devGlenn Kasten2015-05-191-5/+11
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Explain the void send() throws IOExceptionGlenn Kasten2015-05-191-5/+11
| |/ / / /
* | | | | Merge "send without timestamp is not equivalent to send now" into mnc-devGlenn Kasten2015-05-191-3/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | send without timestamp is not equivalent to send nowGlenn Kasten2015-05-191-3/+6
| |/ / /
* | | | Merge "Update documentation for short transfer counts" into mnc-devGlenn Kasten2015-05-191-49/+125
|\ \ \ \
| * | | | Update documentation for short transfer countsGlenn Kasten2015-05-181-49/+125
| |/ / /
* | | | Merge "Minor cleanup of comments and code" into mnc-devGlenn Kasten2015-05-181-12/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Minor cleanup of comments and codeGlenn Kasten2015-05-121-12/+15
* | | | Merge "TIF: Pass the playback params as a whole" into mnc-devJae Seo2015-05-185-20/+16
|\ \ \ \
| * | | | TIF: Pass the playback params as a wholeJae Seo2015-05-165-20/+16
| | |/ / | |/| |
* | | | Merge "Make PlaybackParams parcelable" into mnc-devJae Seo2015-05-182-3/+66
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make PlaybackParams parcelableJae Seo2015-05-182-3/+66
| |/ /
* | | Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc...Lajos Molnar2015-05-182-6/+16
|\ \ \
| * | | media: clarify valid values in PlaybackParams and SyncParamsLajos Molnar2015-05-152-6/+16
* | | | Merge "MediaPlayer: persistent track indices" into mnc-devRobert Shih2015-05-183-82/+144
|\ \ \ \ | |_|/ / |/| | |
| * | | MediaPlayer: persistent track indicesRobert Shih2015-05-153-82/+144
* | | | Merge "Fix SoundPool.unload() return value" into mnc-devAndy Hung2015-05-161-1/+1
|\ \ \ \