summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am bb60bc26: Merge "Musicplayer application can not display DRM files of inte...Jean-Baptiste Queru2012-09-061-1/+2
|\
| * Musicplayer application can not display DRM files of internal storage.Jan Bjernler2012-08-311-1/+2
* | am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
|\ \ | |/
| * Make setCaptureRate locale safeJohan Redestig2012-08-271-3/+2
* | am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
|\ \ | |/
| * To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
* | am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"Jean-Baptiste Queru2012-08-161-2/+2
|\ \ | |/
| * Fix Issue #35489: drm content corruption on GBgit-you.kim72.gmail.com2012-08-131-2/+2
* | am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that d...Jean-Baptiste Queru2012-08-131-1/+4
|\ \ | |/
| * mediacodec: Don't crash if trying to open a codec that does not existMartin Storsjo2012-08-131-1/+4
* | am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"Jean-Baptiste Queru2012-08-101-2/+2
|\ \ | |/
| * Merge "MtpStorage: correct the size of reserve space for MTP"Jean-Baptiste Queru2012-08-101-2/+2
| |\
| | * MtpStorage: correct the size of reserve space for MTPbo huang2012-08-071-2/+2
* | | am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() imme...Jean-Baptiste Queru2012-08-081-2/+1
|\ \ \ | |/ /
| * | mediacodec: Don't suggest calling getOutputFormat() immediatelyMartin Storsjo2012-07-131-2/+1
| |/
* | am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214Jeff Smith2012-07-252-2/+2
|\ \
| * | Fix several cases of broken droiddoc syntaxJeff Smith2012-07-252-2/+2
* | | am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni."...James Dong2012-07-182-8/+5
|\ \ \ | |/ /
| * | Merge "Changed to obtain a parcel in each notify() call in jni." into jb-devJames Dong2012-07-182-8/+5
| |\ \
| | * | Changed to obtain a parcel in each notify() call in jni.Insun Kang2012-07-102-8/+5
* | | | am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." in...Adam Powell2012-07-161-7/+19
|\ \ \ \ | |/ / /
| * | | Properly switch MediaRouter to wired audio over a2dp.Adam Powell2012-07-121-7/+19
* | | | am 10366b93: Merge "Remove the unnecssary intent call." into jb-devYu Shan Emily Lau2012-07-101-11/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Remove the unnecssary intent call." into jb-devYu Shan Emily Lau2012-07-101-11/+5
| |\ \ | | |/ | |/|
| | * Remove the unnecssary intent call.Yu Shan Emily Lau2012-07-101-11/+5
* | | am 099fd80f: docs: add throws notice for isPlaying per external issue 33610Scott Main2012-07-031-0/+2
|\ \ \ | |/ /
| * | docs: add throws notice for isPlayingScott Main2012-07-031-0/+2
* | | am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late...Scott Main2012-06-282-3/+3
|\ \ \ | |/ /
| * | Merge "Minor corrections to the javadoc overview to reflect late API changes....Scott Main2012-06-282-3/+3
| |\ \
| | * | Minor corrections to the javadoc overview to reflect late API changes.Andreas Huber2012-06-272-3/+3
| | |/
* | | am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directo...Mike Lockwood2012-06-261-4/+4
|\ \ \ | |/ /
| * | Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" i...Mike Lockwood2012-06-261-4/+4
| |\ \ | | |/ | |/|
| | * MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletesMike Lockwood2012-06-261-4/+4
* | | am c8c5e98b: Merge "Document some of the more common mimetypes to be used whe...Andreas Huber2012-06-251-0/+16
|\ \ \ | |/ /
| * | Document some of the more common mimetypes to be used when instantiatingAndreas Huber2012-06-251-0/+16
| |/
* | am dbbfa702: Fix MediaRouter bugsAdam Powell2012-06-241-1/+2
|\ \ | |/
| * Fix MediaRouter bugsAdam Powell2012-06-241-1/+2
* | am fd3fd482: Merge "Update route count properly when MediaRouteButton detects...Adam Powell2012-06-231-2/+2
|\ \ | |/
| * Update route count properly when MediaRouteButton detectsAdam Powell2012-06-221-2/+2
* | am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-devAdam Powell2012-06-211-1/+32
|\ \ | |/
| * MediaRouter group volume reportingAdam Powell2012-06-201-1/+32
* | am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-4/+192
|\ \ | |/
| * Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-4/+192
| |\
| | * Expand volume APIs for MediaRouterAdam Powell2012-06-201-4/+192
* | | am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-devPannag Sanketi2012-06-201-3/+12
|\ \ \ | |/ /
| * | Merge "Crash in SurfaceTextureTarget filter open" into jb-devPannag Sanketi2012-06-201-3/+12
| |\ \ | | |/ | |/|
| | * Crash in SurfaceTextureTarget filter openPannag Sanketi2012-06-201-3/+12
* | | am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote pl...Jean-Michel Trivi2012-06-201-16/+0
|\ \ \ | |/ /
| * | Unhide new API in android.media.MediaRouter for remote playbackJean-Michel Trivi2012-06-201-16/+0
* | | am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-devJean-Michel Trivi2012-06-202-8/+30
|\ \ \ | |/ /