summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-devMichael Wright2014-12-031-5/+7
|\
| * Correctly iterate through MediaProjection callbacks.Michael Wright2014-11-211-5/+7
* | Merge "AudioMix address and type, rule exclusion API, dynamic source" into lm...Jean-Michel Trivi2014-12-027-66/+397
|\ \
| * | AudioMix address and type, rule exclusion API, dynamic sourceJean-Michel Trivi2014-11-307-66/+397
* | | Merge "audioservice: system audio control in master volume mode" into lmp-mr1...Jinsuk Kim2014-12-021-47/+59
|\ \ \
| * | | audioservice: system audio control in master volume modeJinsuk Kim2014-12-011-47/+59
| |/ /
* | | Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp...Dongwon Kang2014-12-022-1/+23
|\ \ \
| * | | TIF: fix a race condition when TvInputManager is initializedDongwon Kang2014-12-022-1/+23
* | | | Merge "Missing Javadoc update while API review" into lmp-mr1-devSungsoo Lim2014-12-021-2/+2
|\ \ \ \
| * | | | Missing Javadoc update while API reviewSungsoo Lim2014-11-281-2/+2
| | |/ / | |/| |
* | | | ImageReader: free direct byte buffers once Image is returnedZhijun He2014-12-011-0/+10
| |/ / |/| |
* | | Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1...John Spurlock2014-12-013-18/+23
|\ \ \
| * | | Volume: Improve inline volume controls used in settings.John Spurlock2014-11-283-18/+23
* | | | Set stream volume to max when userMasterVolume is set to true.Wally Yau2014-11-281-8/+8
| |/ / |/| |
* | | 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
|\ \ \ \