summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 276777ea: b/15676582 Fix ordering of sessions returned by MediaSessionManagerRoboErik2014-06-171-1/+2
|\
| * b/15676582 Fix ordering of sessions returned by MediaSessionManagerRoboErik2014-06-161-1/+2
* | Merge "Don't send unneeded messages."Marco Nelissen2014-06-161-1/+1
|\ \
| * | Don't send unneeded messages.Marco Nelissen2014-06-121-1/+1
* | | Work on removing non-session media routing codeRoboErik2014-06-165-969/+38
* | | implement edge styles and underline for closed captionChong Zhang2014-06-161-9/+191
* | | Merge "Add an app ops code for microphone muting."Emily Bernier2014-06-143-1/+18
|\ \ \
| * | | Add an app ops code for microphone muting.Emily Bernier2014-06-163-1/+18
* | | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-122-0/+1288
|\ \ \ \
| * | | | support for CEA-608 closed captionChong Zhang2014-06-112-0/+1288
* | | | | Merge "change onData() to take byte array of raw data"Chong Zhang2014-06-124-52/+86
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | change onData() to take byte array of raw dataChong Zhang2014-06-114-52/+86
* | | | jpeg_bench: Fix checkbuildJi-Hwan Lee2014-06-131-1/+3
* | | | Merge "Add an API to get TV input icon"Jae Seo2014-06-121-0/+13
|\ \ \ \
| * | | | Add an API to get TV input iconJaewan Kim2014-06-121-0/+13
| |/ / /
* | | | am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs...RoboErik2014-06-127-86/+514
|\ \ \ \ | | |_|/ | |/| |
| * | | b/15330955 Make RemoteController use the new session APIsRoboErik2014-06-117-86/+514
* | | | Add channel types for NTSC, PAL and SECAMJae Seo2014-06-111-0/+9
* | | | am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art...Elliott Hughes2014-06-122-14/+10
|\ \ \ \
| * \ \ \ am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."Elliott Hughes2014-06-122-14/+10
| |\ \ \ \
| | * | | | Switch to a type-safe album art interface.Elliott Hughes2014-06-112-14/+10
* | | | | | Merge "AudioManager: add ability to allocate a new session ID"Jean-Michel Trivi2014-06-102-1/+26
|\ \ \ \ \ \
| * | | | | | AudioManager: add ability to allocate a new session IDJean-Michel Trivi2014-06-102-1/+26
| | |_|_|/ / | |/| | | |
* | | | | | CamcorderProfiles: Add 4K video constantsZhijun He2014-06-101-2/+12
|/ / / / /
* | | | | am 6580a31d: Merge "Adds listeners for changes to the list of active sessions...RoboErik2014-06-094-1/+106
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Adds listeners for changes to the list of active sessions" into lmp-pr...RoboErik2014-06-094-1/+106
| |\ \ \ \
| | * | | | Adds listeners for changes to the list of active sessionsRoboErik2014-06-084-1/+106
* | | | | | am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" in...RoboErik2014-06-093-42/+178
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-previe...RoboErik2014-06-093-42/+178
| |\ \ \ \ \ | | |/ / / /
| | * | | | b/15388389 Add volume handling support to MediaRouterRoboErik2014-06-083-42/+178
* | | | | | am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp...RoboErik2014-06-094-2/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add a way to get the package/pid of the session" into lmp-preview-devRoboErik2014-06-094-2/+45
| |\ \ \ \ \
| | * | | | | Add a way to get the package/pid of the sessionRoboErik2014-06-084-2/+45
| | |/ / / /
* | | | | | am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-devJae Seo2014-06-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix a typo in TvContract" into lmp-preview-devJae Seo2014-06-091-1/+1
| |\ \ \ \ \
| | * | | | | Fix a typo in TvContractJae Seo2014-06-091-1/+1
* | | | | | | am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into...Jae Seo2014-06-091-6/+30
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-devJae Seo2014-06-091-6/+30
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | TIF: Address the feedback from the API review - 3/3Jae Seo2014-06-081-6/+30
| | |/ / / /
* | | | | | Merge "Allow profile and device owners to change and get the master volume mu...Julia Reynolds2014-06-093-3/+8
|\ \ \ \ \ \
| * | | | | | Allow profile and device owners to change and get the master volume mute state.Julia Reynolds2014-06-093-3/+8
* | | | | | | am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or no...Wonsik Kim2014-06-091-0/+34
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-pr...Wonsik Kim2014-06-091-0/+34
| |\ \ \ \ \ \
| | * | | | | | Make TvInputs aware of whether it's hardware-based or notWonsik Kim2014-06-071-0/+34
| | | |/ / / / | | |/| | | |
* | | | | | | am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in andro...Elliott Hughes2014-06-091-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_Medi...Elliott Hughes2014-06-091-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.Elliott Hughes2014-06-091-1/+1
* | | | | | | am c523b768: Merge "Make TvView keep the volume value and set later once the ...Dongwon Kang2014-06-091-0/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Make TvView keep the volume value and set later once the connecation is made.Dongwon Kang2014-06-081-0/+8
| | |_|/ / | |/| | |
* | | | | am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRang...Igor Murashkin2014-06-072-23/+558
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |