summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Fix SoundPool.unload() return valueAndy Hung2015-05-151-1/+1
* | | | | Merge "Rename mChannels to mChannelMask" into mnc-devGlenn Kasten2015-05-161-6/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Rename mChannels to mChannelMaskGlenn Kasten2015-05-121-6/+6
| | |_|/ | |/| |
* | | | MediaPlayer: clean up subtitle controller log spamRobert Shih2015-05-151-2/+2
* | | | Merge "MediaDrm API Updates per api council review" into mnc-devJeff Tinker2015-05-152-91/+96
|\ \ \ \
| * | | | MediaDrm API Updates per api council reviewJeff Tinker2015-05-152-91/+96
* | | | | Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-devPaul McLean2015-05-151-1/+1
|\ \ \ \ \
| * | | | | Change AudioDevicesInfo.getFormats() to getEncodings().Paul McLean2015-05-141-1/+1
| | |_|/ / | |/| | |
* | | | | TIF: Remove incorrect audio mode checkJae Seo2015-05-141-10/+4
| |_|_|/ |/| | |
* | | | Merge "ImageReader: Image getFormat should return the Image buffer format" in...Zhijun He2015-05-142-10/+25
|\ \ \ \
| * | | | ImageReader: Image getFormat should return the Image buffer formatZhijun He2015-05-062-10/+25
* | | | | Merge "Image/Reader/Writer: address API review comments" into mnc-devZhijun He2015-05-144-159/+95
|\ \ \ \ \
| * | | | | Image/Reader/Writer: address API review commentsZhijun He2015-05-144-159/+95
| | |/ / / | |/| | |
* | | | | Merge "MediaDataSource: address API council comments" into mnc-devChong Zhang2015-05-143-16/+25
|\ \ \ \ \
| * | | | | MediaDataSource: address API council commentsChong Zhang2015-05-143-16/+25
* | | | | | Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-devLajos Molnar2015-05-142-85/+11
|\ \ \ \ \ \