summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Respect Android conventions in AudioManager extras" into lmp-devJean-Michel Trivi2014-09-051-3/+3
|\
| * Respect Android conventions in AudioManager extrasJean-Michel Trivi2014-09-051-3/+3
* | Merge "AudioAttributes: unhide CREATOR" into lmp-devJean-Michel Trivi2014-09-051-1/+0
|\ \
| * | AudioAttributes: unhide CREATORJean-Michel Trivi2014-09-051-1/+0
| |/
* | Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-devLajos Molnar2014-09-053-7/+13
|\ \
| * | MediaCodecInfo: allow getting info for secure codecLajos Molnar2014-08-283-7/+13
* | | Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-devLajos Molnar2014-09-051-1/+1
|\ \ \
| * | | MediaCodecInfo: rename createFromProfileLevelLajos Molnar2014-09-041-1/+1
* | | | Merge "API review: android.media.tv" into lmp-devJae Seo2014-09-053-75/+71
|\ \ \ \ | |_|_|/ |/| | |
| * | | API review: android.media.tvJae Seo2014-09-053-75/+71
* | | | Merge "send volume button events to adjustSuggestedStream instead of adjustSt...RoboErik2014-09-052-1/+20
|\ \ \ \
| * | | | send volume button events to adjustSuggestedStream instead of adjustStreamRoboErik2014-09-052-1/+20
* | | | | Merge "Minor tweaks to MediaBrowser" into lmp-devRoboErik2014-09-052-3/+20
|\ \ \ \ \ | |/ / / /
| * | | | Minor tweaks to MediaBrowserRoboErik2014-09-052-3/+20
* | | | | Merge "rename add/removeCallback to register/unregisterCallback" into lmp-devRoboErik2014-09-052-12/+12
|\ \ \ \ \ | |/ / / /
| * | | | rename add/removeCallback to register/unregisterCallbackRoboErik2014-09-052-12/+12
* | | | | Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-devRoboErik2014-09-052-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | rename SERVICE_ACTION to SERVICE_INTERFACERoboErik2014-09-042-4/+4
| |/ / /
* | | | Merge "Permission check for entering MODE_IN_CALL" into lmp-devJean-Michel Trivi2014-09-051-2/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Permission check for entering MODE_IN_CALLJean-Michel Trivi2014-09-051-2/+11
* | | | Merge "Ensure there's a valid handler when registering a sessions listener" i...RoboErik2014-09-041-1/+5
|\ \ \ \
| * | | | Ensure there's a valid handler when registering a sessions listenerRoboErik2014-09-031-1/+5
* | | | | Merge "AudioManager: only use main looper for AudioPort event handler" into l...Eric Laurent2014-09-041-4/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | AudioManager: only use main looper for AudioPort event handlerEric Laurent2014-09-031-4/+1
* | | | | Merge "Update VolumeProvider apis per feedback" into lmp-devRoboErik2014-09-043-24/+36
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update VolumeProvider apis per feedbackRoboErik2014-09-033-24/+36
* | | | | Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-devJae Seo2014-09-041-47/+80
|\ \ \ \ \
| * | | | | TIF: Add Quebec ratings for Canada and fix the XML exampleJae Seo2014-09-031-47/+80
* | | | | | Rename ro.config.music_vol_steps into ro.config.media_vol_steps.Jungshik Jang2014-09-041-1/+1
| |/ / / / |/| | | |
* | | | | 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