summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Reload MediaBrowser children on each call to subscribe"RoboErik2015-01-082-10/+10
|\
| * Reload MediaBrowser children on each call to subscribeRoboErik2015-01-072-10/+10
* | Merge "Use channelCountFromOutChannelMask in AudioTrack"Andy Hung2015-01-081-3/+3
|\ \ | |/ |/|
| * Use channelCountFromOutChannelMask in AudioTrackAndy Hung2015-01-061-3/+3
* | am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for point...Narayan Kamath2015-01-062-2/+2
|\ \ | |/ |/|
| * am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments ...Narayan Kamath2015-01-062-2/+2
| |\
| | * Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."Narayan Kamath2015-01-062-2/+2
| | |\
| | | * Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.Haitao Feng2015-01-062-2/+2
* | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
|\ \ \ \ | |/ / /
| * | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ | | |/ /
| | * | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| | |\ \ | | | |/ | | |/|
| | | * Race-condition in SoundPool during releaseDariusz Iwanoczko2014-11-111-3/+3
* | | | Merge "Fix build"Glenn Kasten2014-12-291-1/+1
|\ \ \ \
| * | | | Fix buildGlenn Kasten2014-12-291-1/+1
* | | | | Merge "Update API documentation for static AudioTrack"Glenn Kasten2014-12-291-11/+47
|\ \ \ \ \ | |/ / / /
| * | | | Update API documentation for static AudioTrackGlenn Kasten2014-12-231-11/+47
* | | | | am af84e073: Merge "Audio Policy: Clear calling identity for all paths settin...John Spurlock2014-12-281-32/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am af84e073: Merge "Audio Policy: Clear calling identity for all paths settin...John Spurlock2014-12-281-32/+27
| |\ \ \ \
| | * \ \ \ Merge "Audio Policy: Clear calling identity for all paths setting ringer mode...John Spurlock2014-12-241-32/+27
| | |\ \ \ \
| | | * | | | Audio Policy: Clear calling identity for all paths setting ringer mode.John Spurlock2014-12-231-32/+27
* | | | | | | am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1...Jean-Michel Trivi2014-12-261-6/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1...Jean-Michel Trivi2014-12-261-6/+11
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "AudioRecord: filter attributes" into lmp-mr1-devJean-Michel Trivi2014-12-221-6/+11
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | AudioRecord: filter attributesJean-Michel Trivi2014-12-221-6/+11
* | | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lm...Eric Laurent2014-12-191-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lm...Eric Laurent2014-12-191-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "AudioService: fix permission check." into lmp-mr1-devEric Laurent2014-12-191-0/+3
| | |\ \ \ \ \
| | | * | | | | AudioService: fix permission check.Eric Laurent2014-12-181-0/+3
| | | |/ / / /
* | | | | | | am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Applica...Oliver Woodman2014-12-191-4/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Applica...Oliver Woodman2014-12-191-4/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1...Oliver Woodman2014-12-191-4/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | MediaSessionLegacyHelper uses global Application contextJean-Michel Trivi2014-12-181-4/+1
* | | | | | am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate a...John Spurlock2014-12-171-23/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate a...John Spurlock2014-12-171-23/+35
| |\ \ \ \ \ | | |/ / / /
| | * | | | Audio policy: Fix deprecated shouldVibrate api.John Spurlock2014-12-171-23/+35
| | |/ / /
* | | | | Merge "Include documentation for a null surface in TvInputService.Session.onS...Nick Chalko2014-12-171-7/+10
|\ \ \ \ \
| * | | | | Include documentation for a null surface in TvInputService.Session.onSetSurface.Nick Chalko2014-12-161-7/+10
* | | | | | am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-163-15/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-163-15/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-163-15/+0
* | | | | am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ca...Jinsuk Kim2014-12-131-10/+14
|\ \ \ \ \ | |/ / / /
| * | | | am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ca...Jinsuk Kim2014-12-131-10/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "audioservice: Clear calling identity upon calling HdmiControlService" ...Jinsuk Kim2014-12-131-10/+14
| | |\ \ \
| | | * | | audioservice: Clear calling identity upon calling HdmiControlServiceJinsuk Kim2014-12-131-10/+14
* | | | | | am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" in...Chong Zhang2014-12-121-3/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" in...Chong Zhang2014-12-121-3/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "parse bitrate range for video/audio caps" into lmp-mr1-devChong Zhang2014-12-121-3/+20
| | |\ \ \ \
| | | * | | | parse bitrate range for video/audio capsChong Zhang2014-12-121-3/+20
* | | | | | | Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest""Jeff Tinker2014-12-121-14/+4
|\ \ \ \ \ \ \
| * | | | | | | Revert "Fix Crash when sending null in HashMap to getKeyRequest"Jeff Tinker2014-12-121-14/+4