summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-016-17/+120
|\
| * MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-306-17/+120
* | Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
|\ \
| * | Fix a crash caseMike J. Chen2013-04-261-5/+6
| |/
* | libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
|/
* Merge "Identify in logs launch of voice search from key events" into jb-mr2-devJean-Michel Trivi2013-04-231-0/+2
|\
| * Identify in logs launch of voice search from key eventsJean-Michel Trivi2013-04-191-0/+2
* | Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" in...Jean-Michel Trivi2013-04-225-23/+182
|\ \
| * | Opt-in mechanism for RemoteControlClient position anti-drift checkJean-Michel Trivi2013-04-225-23/+182
| |/
* | Change doc comment to match API changeKenny Root2013-04-191-1/+1
* | Correct algorithm property name and clarify javadoc description ofJeff Tinker2013-04-191-3/+3
|/
* Merge "Anti-drift in RCC playback position" into jb-mr2-devJean-Michel Trivi2013-04-191-1/+118
|\
| * Anti-drift in RCC playback positionJean-Michel Trivi2013-04-181-1/+118
* | Merge "AudioService: SCO audio backward compatibility" into jb-mr2-devEric Laurent2013-04-193-13/+55
|\ \
| * | AudioService: SCO audio backward compatibilityEric Laurent2013-04-173-13/+55
* | | Merge "Add some documentation to MediaCodecInfo" into jb-mr2-devAndreas Huber2013-04-191-0/+14
|\ \ \
| * | | Add some documentation to MediaCodecInfoAndreas Huber2013-04-181-0/+14
* | | | Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2...Jeff Tinker2013-04-181-0/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53
* | | | Merge "Make MediaDrm APIs public" into jb-mr2-devJeff Tinker2013-04-183-150/+305
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Make MediaDrm APIs publicJeff Tinker2013-04-173-150/+305
| |/
* | Fix message handling in RemoteControlClientJean-Michel Trivi2013-04-161-10/+11
|/
* Merge "Clarify how release of offline keys is handled in the MediaDrm API" in...Jeff Tinker2013-04-151-14/+21
|\
| * Clarify how release of offline keys is handled in the MediaDrm APIJeff Tinker2013-04-121-14/+21
* | fix javadoc buildScott Main2013-04-151-2/+2
* | Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-devJean-Michel Trivi2013-04-151-20/+9
|\ \
| * | Public APIs for media position in RemoteControlClientJean-Michel Trivi2013-04-141-20/+9
| |/
* | Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from"...Andreas Huber2013-04-151-6/+7
|\ \
| * | MediaExtractor.setDataSource(...) has always thrown IOExceptions fromAndreas Huber2013-04-111-6/+7
| |/
* | Document that MediaPlayer.getDuration() returns an invalid value (-1)Andreas Huber2013-04-111-1/+2
|/
* Make MediaRouter ignore remembered wifi displays when wifi display is offAdam Powell2013-04-101-4/+13
* Merge "Handle seek requests in AudioService" into jb-mr2-devJean-Michel Trivi2013-04-102-2/+17
|\
| * Handle seek requests in AudioServiceJean-Michel Trivi2013-04-092-2/+17
* | Add liblogYing Wang2013-04-099-8/+13
* | Merge "Add support for common encryption" into jb-mr2-devMarco Nelissen2013-04-085-3/+97
|\ \
| * | Add support for common encryptionMarco Nelissen2013-04-085-3/+97
* | | Merge "Have audio service clean up new receivers in crashing processes." into...Dianne Hackborn2013-04-083-16/+69
|\ \ \
| * | | Have audio service clean up new receivers in crashing processes.Dianne Hackborn2013-04-083-16/+69
* | | | Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-m...ztenghui2013-04-081-2/+4
|\ \ \ \
| * | | | Update the documentiation for MediaMuxer::writeSampleData()ztenghui2013-04-031-2/+4
| | |/ / | |/| |
* | | | Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-devEric Laurent2013-04-051-9/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | AudioService: do not use virtual call for bt scoEric Laurent2013-04-051-9/+5
| | |/ | |/|
* | | Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-devGlenn Kasten2013-04-051-1/+1
|\ \ \
| * | | Fix AudioTrack.setPlaybackRate() error handlingGlenn Kasten2013-04-031-1/+1
| |/ /
* | | Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-053-14/+175
|\ \ \ | |/ / |/| |
| * | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-033-14/+175
* | | Merge "RemoteControlClient receives playback position change requests" into j...Jean-Michel Trivi2013-04-036-34/+174
|\ \ \
| * | | RemoteControlClient receives playback position change requestsJean-Michel Trivi2013-04-016-34/+174
| | |/ | |/|
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-022-87/+420
|\ \ \ | | |/ | |/|
| * | MediaDrm API updateJeff Tinker2013-04-012-87/+420