summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 7fa9667f: Merge "Clarify how release of offline keys is handled in the Med...Jeff Tinker2013-04-151-14/+21
|\
| * 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
* | | am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-devScott Main2013-04-151-2/+2
|\ \ \ | |/ /
| * | fix javadoc buildScott Main2013-04-151-2/+2
* | | am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" in...Jean-Michel Trivi2013-04-151-20/+9
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExc...Andreas Huber2013-04-151-6/+7
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invali...Andreas Huber2013-04-151-1/+2
|\ \ \ | |/ /
| * | Document that MediaPlayer.getDuration() returns an invalid value (-1)Andreas Huber2013-04-111-1/+2
| |/
* | am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wif...Adam Powell2013-04-101-4/+13
|\ \ | |/
| * Make MediaRouter ignore remembered wifi displays when wifi display is offAdam Powell2013-04-101-4/+13
* | am 8515256a: Merge "Handle seek requests in AudioService" into jb-mr2-devJean-Michel Trivi2013-04-102-2/+17
|\ \ | |/
| * 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
* | | am d8b26d6c: Merge "Add liblog" into jb-mr2-devYing Wang2013-04-099-8/+13
|\ \ \ | |/ /
| * | Add liblogYing Wang2013-04-099-8/+13
* | | am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-devMarco Nelissen2013-04-085-3/+97
|\ \ \ | |/ /
| * | 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
* | | | am bc948101: Merge "Have audio service clean up new receivers in crashing pro...Dianne Hackborn2013-04-083-16/+69
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData...ztenghui2013-04-081-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/ / | | |/| |
* | | | | am e8d9d2b3: Merge "AudioService: do not use virtual call for bt sco" into jb...Eric Laurent2013-04-051-9/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/ | | |/|
* | | | am 564c866b: Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-...Glenn Kasten2013-04-051-1/+1
|\ \ \ \ | |/ / /
| * | | 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
| | |/ /
* | | | am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app...Jeff Tinker2013-04-043-14/+175
|\ \ \ \ | |/ / /
| * | | 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
* | | | am 6a570204: Merge "RemoteControlClient receives playback position change req...Jean-Michel Trivi2013-04-036-34/+174
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain A...Andreas Huber2013-04-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"Andreas Huber2013-04-031-1/+1
| |\ \ \
| | * | | MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATMMartin Storsjo2013-02-261-1/+1
* | | | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-022-87/+420
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | MediaDrm API updateJeff Tinker2013-04-012-87/+420
* | | | | Merge "Clean up role of component name in media button event receiver" into j...Jean-Michel Trivi2013-04-023-11/+17
|\ \ \ \ \
| * | | | | Clean up role of component name in media button event receiverJean-Michel Trivi2013-03-303-11/+17
* | | | | | Merge "Fix a doc typo." into jb-mr2-devJeff Brown2013-04-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fix a doc typo.Jeff Brown2013-04-011-1/+1
| | |_|_|_|/ | |/| | | |
generated by cgit v1.1 at 2025-03-14 13:24:17 +0000