summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/media
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-0/+8
|\
| * DO NOT MERGE Check caller for sending media key to global priority sessionJaewan Kim2016-09-271-0/+8
* | AVRCP 1.5 implementationAyan Ghosh2015-10-061-0/+182
|/
* Unregister the existing callback when MediaProjection stopsJae Seo2015-08-041-5/+8
* MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActiveDongwon Kang2015-07-201-27/+19
* Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-devJae Seo2015-07-201-14/+13
|\
| * MediaSession: Do not lock on AudioManager.getStreamVolumeJae Seo2015-07-171-14/+13
* | Media button intent should be send to current user only.heechul.hyun2015-06-261-1/+1
|/
* Make MediaSessionService not blocked by AudioService.Dongwon Kang2015-06-171-7/+27
* Prevent NPE in MediaSessionServiceJean-Michel Trivi2015-05-111-2/+3
* Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-061-15/+0
* Update use of procstate for services.Dianne Hackborn2015-04-291-1/+2
* Added MediaController.TransportControls#playFromUri.P.Y. Laligand2015-03-251-0/+14
* resolved conflicts for merge of 13d81b6d to masterJeff Brown2015-03-231-5/+19
|\
| * Disable more hotkeys while in setup.Jeff Brown2015-03-201-1/+15
* | AudioService: Write base stream volume changes to the event log.John Spurlock2015-03-121-1/+1
* | MediaSession: Notify PlaybackInfo callbacks when playback type changes.John Spurlock2015-03-101-0/+2
* | Audio: Remove the concept of master volume.John Spurlock2015-03-042-28/+2
* | Remove unused imports in frameworks/base.John Spurlock2015-02-283-11/+0
* | VolumePrototypes: Allow current controller to access sessions.John Spurlock2015-02-221-2/+8
* | Volume prototypes: Allow delegate volume UI to set remote controller.John Spurlock2015-02-171-2/+12
* | Merge "Add extra logging for media button events"RoboErik2015-02-111-0/+4
|\ \
| * | Add extra logging for media button eventsRoboErik2015-02-111-0/+4
* | | Merge "Stop active media projections on user switch." into lmp-mr1-dev autome...Michael Wright2015-02-111-0/+5
|\ \ \ | |/ / |/| / | |/
| * Stop active media projections on user switch.Michael Wright2015-02-061-0/+5
* | Fix crash in dumpsys media_sessionRoboErik2015-02-021-1/+1
* | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-292-74/+14
* | Persist safe MediaSession intents across rebootsRoboErik2015-01-201-9/+43
* | am b2949e1b: am 694940be: am d5ff63ba: Merge "Notify the system of all remote...RoboErik2015-01-162-8/+16
|\ \ | |/
| * Notify the system of all remote volume changesRoboErik2015-01-162-8/+16
| * Don't unmute when trying to show volume UI. DO NOT MERGERoboErik2015-01-072-10/+11
| * DO NOT MERGE Fix typoSungsoo Lim2015-01-051-4/+4
| * DO NOT MERGE Make mute/unmute workSungsoo Lim2015-01-051-2/+6
* | Don't unmute when trying to show volume UIRoboErik2015-01-072-10/+11
* | Fix typoSungsoo Lim2015-01-051-4/+4
* | Make mute/unmute workSungsoo Lim2014-12-291-2/+6
* | am a1bd2d00: am 1ed9a88e: Merge "MediaSession: unmute stream when adjusting v...Eric Laurent2014-12-192-11/+35
|\ \ | |/
| * MediaSession: unmute stream when adjusting volumeEric Laurent2014-12-192-11/+35
* | am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through M...RoboErik2014-12-092-15/+53
|\ \ | |/
| * Route mute key events through MediaSessionServiceRoboErik2014-12-052-15/+53
* | am 91bba400: am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the Media...RoboErik2014-12-052-4/+35
|\ \ | |/
| * Tweak the behavior of the MediaSessionStackRoboErik2014-12-022-4/+35
* | am e36131be: am 74086d44: am a08adb24: Fix binder equality checkRoboErik2014-11-241-1/+2
|\ \ | |/
| * Fix binder equality checkRoboErik2014-11-211-1/+2
* | am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume device...RoboErik2014-11-212-2/+19
|\ \ | |/
| * Handle volume events on master volume devices correctlyRoboErik2014-11-182-2/+19
* | am 0f17d95e: am 9e070715: am f338fcba: Merge "Use the suggested stream if it\...RoboErik2014-11-141-1/+12
|\ \ | |/
| * Use the suggested stream if it's currently activeRoboErik2014-11-111-1/+12
* | am 48d7a89c: Add missing passive discovery flag automerge: 4444c5b automerge:...Jason Monk2014-10-281-1/+2
|\ \ | |/
| * Add missing passive discovery flag automerge: 4444c5bJason Monk2014-10-281-1/+2
| |\