summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Do not perform forceVolumeControlStream in master volume mode" into lm...Jinsuk Kim2014-11-261-0/+3
|\
| * Do not perform forceVolumeControlStream in master volume modeJinsuk Kim2014-11-261-0/+3
* | Fix broken @see javadoc in android.media.* classesRyan Lothian2014-11-264-12/+11
* | Merge "Allow set loop and position before write for static AudioTracks" into ...Andy Hung2014-11-261-2/+2
|\ \
| * | Allow set loop and position before write for static AudioTracksAndy Hung2014-11-241-2/+2
* | | Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into...Eric Laurent2014-11-251-2/+2
|\ \ \
| * | | AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.Eric Laurent2014-11-181-2/+2
* | | | Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1...Lajos Molnar2014-11-251-4/+4
|\ \ \ \
| * | | | media: add support for 160-byte image info in MediaCodecLajos Molnar2014-11-241-4/+4
* | | | | VolumeZen: Introduce internal vs external ringer mode.John Spurlock2014-11-255-72/+223
|/ / / /
* | | | Merge "Delay calling onConnected until a session is set in MediaBrowser" into...RoboErik2014-11-241-7/+27
|\ \ \ \
| * | | | Delay calling onConnected until a session is set in MediaBrowserRoboErik2014-11-241-7/+27
| | |_|/ | |/| |
* | | | Add support for audio focus lockingJean-Michel Trivi2014-11-245-44/+166
| |_|/ |/| |
* | | media: fix isSupportedFormat for integer frame rateLajos Molnar2014-11-201-4/+4
|/ /
* | Merge "Convert record channel mask for dynamic mix" into lmp-mr1-devJean-Michel Trivi2014-11-202-1/+31
|\ \
| * | Convert record channel mask for dynamic mixJean-Michel Trivi2014-11-202-1/+31
| |/
* | Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView....Jae Seo2014-11-201-0/+39
|\ \
| * | TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.Dongwon Kang2014-11-191-0/+39
| |/
* | Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfig...Jae Seo2014-11-201-0/+6
|\ \
| * | TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()Wonsik Kim2014-11-121-0/+6
* | | Merge "Handle volume events on master volume devices correctly" into lmp-mr1-devRoboErik2014-11-202-9/+24
|\ \ \
| * | | Handle volume events on master volume devices correctlyRoboErik2014-11-182-9/+24
| |/ /
* | | Scale bitmaps in metadata sent to the systemRoboErik2014-11-192-5/+42
| |/ |/|
* | Merge "TIF: make the tune request handling more efficient" into lmp-mr1-devJae Seo2014-11-181-0/+8
|\ \
| * | TIF: make the tune request handling more efficientDongwon Kang2014-11-181-0/+8
* | | Volume: Don't allow ringer volume of 0 exiting ringer mode.John Spurlock2014-11-181-2/+2
|/ /
* | Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-devJeff Sharkey2014-11-131-3/+9
|\ \
| * | Move ringtone redirection to MediaPlayer.Jeff Sharkey2014-11-131-3/+9
| |/
* | Merge "Support for delayed audio focus" into lmp-mr1-devJean-Michel Trivi2014-11-135-36/+187
|\ \
| * | Support for delayed audio focusJean-Michel Trivi2014-11-115-36/+187
* | | MTP: Update JNI for new packet gettersMike Lockwood2014-11-131-72/+75
| |/ |/|
* | Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp...Chong Zhang2014-11-111-1/+5
|\ \
| * | return error MEDIA_ERROR_UNSUPPORTED when Range request failChong Zhang2014-11-101-1/+5
* | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-071-2/+2
|\ \ \
| * | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-041-2/+2
* | | | am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-devJason Parks2014-11-071-0/+4
|\ \ \ \
| * | | | Fix NPE for CTS.Jason Parks2014-11-061-0/+4
* | | | | Merge changes If4c38bfe,Id9878186 into lmp-mr1-devRoboErik2014-11-062-0/+35
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update metadata artwork and uri docsRoboErik2014-11-061-0/+29
| * | | | skip MediaController callbacks if it's been unregisteredRoboErik2014-11-051-0/+6
* | | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-062-0/+56
|\ \ \ \ \
| * | | | | Add missing secure stop methodsJeff Tinker2014-11-032-0/+56
* | | | | | Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-devEric Laurent2014-11-051-18/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | AudioEffect JNI: use new max preprocessing constantEric Laurent2014-11-051-18/+2
* | | | | | am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent me...Andrew Solovay2014-11-051-1/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent me...Andrew Solovay2014-11-051-1/+0
| |\ \ \ \ \
| | * | | | | docs: Removed broken link to non-existent method.Andrew Solovay2014-11-041-1/+0
* | | | | | | Merge "Post volume requests to the handler thread in MediaSession" into lmp-m...RoboErik2014-11-051-10/+37
|\ \ \ \ \ \ \
| * | | | | | | Post volume requests to the handler thread in MediaSessionRoboErik2014-10-281-10/+37
* | | | | | | | Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-devRoboErik2014-11-052-4/+53
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |