summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix regression in CTS for AudioTrack" into lmp-devGlenn Kasten2014-09-031-1/+1
|\
| * Fix regression in CTS for AudioTrackGlenn Kasten2014-09-021-1/+1
* | Add a warning log when it takes long time to handle a message in TISYoungsang Cho2014-09-031-14/+22
* | Merge "Allow empty strings in playFromSearch" into lmp-devRoboErik2014-09-032-5/+12
|\ \
| * | Allow empty strings in playFromSearchRoboErik2014-09-022-5/+12
* | | Merge changes Id38bcf7c,I54f156d9 into lmp-devRoboErik2014-09-031-2/+3
|\ \ \ | |/ /
| * | Update MediaController comment to mention notification listenersRoboErik2014-09-021-2/+3
* | | Merge "Make stream_music volume configurable." into lmp-devJungshik Jang2014-09-021-0/+3
|\ \ \ | |/ / |/| |
| * | Make stream_music volume configurable.Jungshik Jang2014-09-011-0/+3
* | | Merge "Restore permission check for mic muting" into lmp-devJean-Michel Trivi2014-09-021-0/+3
|\ \ \
| * | | Restore permission check for mic mutingJean-Michel Trivi2014-09-021-0/+3
* | | | Merge "VirtualDisplay.Callbacks -> Callback" into lmp-devMichael Wright2014-09-021-6/+6
|\ \ \ \
| * | | | VirtualDisplay.Callbacks -> CallbackMichael Wright2014-09-011-6/+6
* | | | | Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" i...Jean-Michel Trivi2014-09-022-9/+129
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Move *_AUDIO_PLUG actions from Intent to android.media.AudioManagerJean-Michel Trivi2014-08-292-9/+129
* | | | | Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and V...Ronghua Wu2014-09-021-0/+4
|\ \ \ \ \
| * | | | | API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoViewRonghua Wu2014-08-251-0/+4
* | | | | | Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-devRoboErik2014-09-024-112/+103
|\ \ \ \ \ \
| * | | | | | Update MediaBrowser to use String ids instead of UrisRoboErik2014-08-294-112/+103
* | | | | | | Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp...Jae Seo2014-09-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGEJae Seo2014-09-011-2/+2
* | | | | | | | Merge "TIF: Fix the Singapore content ratings" into lmp-devJae Seo2014-09-021-15/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | TIF: Fix the Singapore content ratingsJae Seo2014-09-021-15/+19
| |/ / / / / / /
* | | | | | | | Merge "Do not show the input icon when it's not available." into lmp-devSungsoo Lim2014-09-021-7/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not show the input icon when it's not available.Sungsoo Lim2014-09-021-7/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | TIF: add SystemApi's for ITvInputHardware related methodsWonsik Kim2014-09-021-0/+125
|/ / / / / /
* | | | | | Add missing checks for the current session callbackJi-Hwan Lee2014-08-301-0/+6
* | | | | | Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio ...Rachad2014-08-301-5/+8
|\ \ \ \ \ \
| * | | | | | Tunneled Video Playback:Rachad2014-08-281-5/+8
* | | | | | | Merge "TIF: Fix comment on TvContentRating" into lmp-devJae Seo2014-08-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | TIF: Fix comment on TvContentRatingJae Seo2014-08-291-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" int...RoboErik2014-08-291-0/+10
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Document MediaSession.Callback.onMediaButtonEvent and add returnsRoboErik2014-08-291-0/+10
* | | | | | | Replace "Comment" to "Description" since description makes more sense inAndrew Jeon2014-08-291-4/+4
| |/ / / / / |/| | | | |
* | | | | | Merge "Fix exception message string formatting in MediaDrm" into lmp-devJeff Tinker2014-08-291-2/+2
|\ \ \ \ \ \
| * | | | | | Fix exception message string formatting in MediaDrmJeff Tinker2014-08-271-2/+2
* | | | | | | TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.Dongwon Kang2014-08-291-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-devJean-Michel Trivi2014-08-281-0/+9
|\ \ \ \ \ \
| * | | | | | android.media.Ringtone: add getter for AudioAttributesJean-Michel Trivi2014-08-271-0/+9
* | | | | | | Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-devJean-Michel Trivi2014-08-281-4/+12
|\ \ \ \ \ \ \
| * | | | | | | More AudioManager.generateAudioSessionId() javadocJean-Michel Trivi2014-08-251-4/+12
* | | | | | | | Merge "Update to MediaBrowser APIs per council feedback" into lmp-devRoboErik2014-08-2814-819/+584
|\ \ \ \ \ \ \ \
| * | | | | | | | Update to MediaBrowser APIs per council feedbackRoboErik2014-08-2814-819/+584
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Set/unset session on the callback" into lmp-devRoboErik2014-08-281-10/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Set/unset session on the callbackRoboErik2014-08-281-10/+14
| |/ / / / / / /
* | | | | | | | Merge "Add Media Player Streaming Tests" into lmp-devShaohan Zou2014-08-283-55/+227
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Media Player Streaming TestsShaohan Zou2014-08-273-55/+227
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-devJulia Reynolds2014-08-281-5/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Audio/Micrphone user restriction/multiuser updates.Julia Reynolds2014-08-271-5/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Enhance audio service dumpsys.John Spurlock2014-08-282-2/+20