summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "media: update MediaCodec/Info/List/Format APIs based on review comment...Lajos Molnar2014-08-285-1500/+1553
|\
| * media: update MediaCodec/Info/List/Format APIs based on review commentsLajos Molnar2014-08-275-1500/+1553
* | TIF: Enable applications to register custom content rating systemsJae Seo2014-08-276-36/+184
* | Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-devEric Laurent2014-08-271-1/+2
|\ \ | |/ |/|
| * fix condition to send ACTION_AUDIO_BECOMING_NOISY intentEric Laurent2014-08-271-1/+2
* | Merge "Camera2: Correct error handling" into lmp-devEino-Ville Talvala2014-08-272-10/+10
|\ \
| * | Camera2: Correct error handlingEino-Ville Talvala2014-08-272-10/+10
| |/
* | Merge "SoundPool.Builder: document default values" into lmp-devJean-Michel Trivi2014-08-271-0/+4
|\ \ | |/ |/|
| * SoundPool.Builder: document default valuesJean-Michel Trivi2014-08-251-0/+4
* | Merge "TIF: Make TV content rating names consistent" into lmp-devJae Seo2014-08-261-6/+6
|\ \
| * | TIF: Make TV content rating names consistentJae Seo2014-08-261-6/+6
* | | Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-devJi-Hwan Lee2014-08-261-1/+5
|\ \ \ | |/ / |/| |
| * | TIF: Reset main TvView only for explicit reset() callJi-Hwan Lee2014-08-271-1/+5
* | | Merge "Reset a session callback variable when tune is failed" into lmp-devYoungsang Cho2014-08-261-0/+1
|\ \ \ | |/ / |/| |
| * | Reset a session callback variable when tune is failedYoungsang Cho2014-08-261-0/+1
* | | Recreate overlay view after the TIS crashesChulwoo Lee2014-08-261-0/+2
|/ /
* | Fix checking trackIdChulwoo Lee2014-08-261-3/+15
* | Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementati...Dongwon Kang2014-08-251-1/+3
|\ \ | |/ |/|
| * TIF: fix NPE when notifyXXX is called on c-tor of Session implementationDongwon Kang2014-08-261-1/+3
* | Merge "QS: Wire up screen casting to tile/panel." into lmp-devJohn Spurlock2014-08-251-0/+17
|\ \
| * | QS: Wire up screen casting to tile/panel.John Spurlock2014-08-251-0/+17
* | | Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into...Nancy Chen2014-08-251-3/+3
|\ \ \
| * | | API review PhoneManager -> TelecommManager. Rename methods (6/6)Nancy Chen2014-08-251-3/+3
* | | | Merge "Ensure current volume is current" into lmp-devRoboErik2014-08-251-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Ensure current volume is currentRoboErik2014-08-221-0/+1
* | | | TIF: define hidden channels columns as @SystemApiWonsik Kim2014-08-251-0/+2
| |_|/ |/| |
* | | Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp...Lajos Molnar2014-08-221-2/+27
|\ \ \
| * | | MediaCodeInfo: fix support for feature-can-swap-width-heightLajos Molnar2014-08-211-2/+27
* | | | Merge "TIF: Fix comments in TvContentRating" into lmp-devJae Seo2014-08-221-64/+81
|\ \ \ \ | |_|_|/ |/| | |
| * | | TIF: Fix comments in TvContentRatingJae Seo2014-08-221-64/+81
| |/ /
* | | Merge "Send notification messages immediatelly" into lmp-devYoungsang Cho2014-08-221-9/+17
|\ \ \ | |/ / |/| |
| * | Send notification messages immediatellyYoungsang Cho2014-08-231-9/+17
* | | Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive pl...Lajos Molnar2014-08-211-5/+59
|\ \ \
| * | | MediaCodec: expand documentation on flush/EOS handling and adaptive playbackLajos Molnar2014-08-201-5/+59
* | | | Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-devRonghua Wu2014-08-211-1/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | MediaHTTPConnection: handles cross protocol redirects.Ronghua Wu2014-08-211-1/+8
* | | | Always set transport control flagsRoboErik2014-08-211-3/+1
* | | | Merge "Set transport control flags when a session is created" into lmp-devRoboErik2014-08-211-0/+3
|\ \ \ \
| * | | | Set transport control flags when a session is createdRoboErik2014-08-201-0/+3
* | | | | TIF: Accept any character for custom label.Jaewan Kim2014-08-221-15/+10
* | | | | TIF: Release main TvView on reset()Ji-Hwan Lee2014-08-211-9/+17
| |_|_|/ |/| | |
* | | | API Review: android.media.tvJae Seo2014-08-201-71/+68
| |_|/ |/| |
* | | Only select bluetooth route by default when A2DP is enabled.Jeff Brown2014-08-201-9/+11
|/ /
* | Api updates to MediaSession componentsRoboErik2014-08-205-51/+74
|/
* Remove incomplete media router API. (DO NOT MERGE)Jeff Brown2014-08-1920-3749/+0
* Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-devJae Seo2014-08-191-2/+33
|\
| * TIF: Add the video frame rate information to TvTrackInfoJae Seo2014-08-191-2/+33
* | API Review: android.media.tvJae Seo2014-08-191-19/+13
* | media.MediaPlayer: don't check file-existence for URI-s with schemeLajos Molnar2014-08-191-12/+11
* | Update MediaSession APIs for council feedbackRoboErik2014-08-197-152/+167
|/