summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge "media: update MediaCodec/Info/List/Format APIs based on review comment...Lajos Molnar2014-08-285-1500/+1553
|\ \ \ \ \ \
| * | | | | | media: update MediaCodec/Info/List/Format APIs based on review commentsLajos Molnar2014-08-275-1500/+1553
* | | | | | | TIF: Enable applications to register custom content rating systemsJae Seo2014-08-276-36/+184
| |_|/ / / / |/| | | | |
* | | | | | Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-devEric Laurent2014-08-271-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix condition to send ACTION_AUDIO_BECOMING_NOISY intentEric Laurent2014-08-271-1/+2
* | | | | | Merge "Camera2: Correct error handling" into lmp-devEino-Ville Talvala2014-08-272-10/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Camera2: Correct error handlingEino-Ville Talvala2014-08-272-10/+10
| |/ / / /
* | | | | Merge "SoundPool.Builder: document default values" into lmp-devJean-Michel Trivi2014-08-271-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SoundPool.Builder: document default valuesJean-Michel Trivi2014-08-251-0/+4
| |/ / /
* | | | Merge "TIF: Make TV content rating names consistent" into lmp-devJae Seo2014-08-261-6/+6
|\ \ \ \
| * | | | TIF: Make TV content rating names consistentJae Seo2014-08-261-6/+6
| | |/ / | |/| |