summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* TIF: Enable to build uri for browsableOnly channelsChulwoo Lee2014-08-131-17/+21
| | | | | BUG: 16966138 Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
* Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-devJean-Michel Trivi2014-08-122-14/+38
|\
| * Add support for AudioAttributes in android.media.RingtoneJean-Michel Trivi2014-08-122-14/+38
| | | | | | | | | | | | | | | | | | | | Deprecate use of stream types. Map deprecated API to AudioAttributes. Add new methods to specify AudioAttributes on a Ringtone instance. Bug 16790748 Change-Id: Ifb3c2e838e1f119614459ad7d71d83a4d7c9ffdb
* | Fix hashCode of TvContentRatingSungsoo Lim2014-08-131-1/+1
|/ | | | | Bug: 16963556 Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
* HDMI plug intent and associated informationJean-Michel Trivi2014-08-121-1/+44
| | | | | | | | | | | Read HDMI device information from audio ports and add it as extras in the connection intent. Document the new extras in the connection intent. Make Intent.ACTION_HDMI_AUDIO_PLUG public. Bug 10549017 Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
* Add equals method of TvContentRatingSungsoo Lim2014-08-121-1/+35
| | | | | Bug: 16963556 Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
* Merge "Treat empty subrating as the same as null subratings." into lmp-devJaewan Kim2014-08-111-1/+9
|\
| * Treat empty subrating as the same as null subratings.Jaewan Kim2014-08-121-1/+9
| | | | | | | | Change-Id: Ic288c680c639ccba6cf593d1286776a6c891b726
* | Add version attribute in tv_content_rating_system.xmlSungsoo Lim2014-08-121-8/+6
|/ | | | | | | | | - 'version' attribute is added in 'rating-system-definitions' tag. - Update javadoc for the format change of XML file in TvContentRating. - Fix some errors in the javadoc comment. Bug: 16805703 Change-Id: If9473c89cef0777232470d67f1542a5e5eac3182
* Talkback: Ensure TTS stream is not affected by ringer mode.John Spurlock2014-08-121-4/+1
| | | | | | | | | Now that the policy for tablets and phones are unified, follow the same policy when deciding which streams are never affected by ringer mode. Bug:16885683 Change-Id: Iaf526b391de9f429cb9e99ec18a417108443acf6
* Ensure that custom label isn't emptyJaewan Kim2014-08-111-7/+10
| | | | | | | This also changes getHiddenTvInputIds to return mutable ArrayList. Bug: 16876078 Change-Id: Ib84a071e7a7cf390ac4f9cf69f3d8daf218d657d
* TIF: Add content rating systemsSungsoo Lim2014-08-111-643/+1081
| | | | | | | | | | - Change the strings for translation to English only. - Add content rating systems for many countries. - Update javadoc of TvContentRating which is auto-generated based on tv_content_rating_systems.xml and strings.xml Bug: 16862855, Bug: 16889743 Change-Id: Ifd81c85934b8631e8ae00633639989275982ecfb
* Merge "TIF: Move watch history logging to TvProvider" into lmp-devJae Seo2014-08-091-8/+23
|\
| * TIF: Move watch history logging to TvProviderJae Seo2014-08-101-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are only two kinds of watch events that can happen on the system: 1. The current TV input session is tuned to a new channel. 2. The session is released for some reason. The former indicates the end of the previous log entry, if any, followed by the start of a new entry. The latter indicates the end of the most recent entry for the given session. Here the system supplies the database the smallest set of information only that is sufficient to consolidate the log entries while minimizing database operations in the system service. Bug: 14791151, Bug: 15921205, Bug: 15988715, Bug: 16831555 Change-Id: Ifcb1a1273c14ee234919d819d082b1004eb92ebc
* | Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-devJean-Michel Trivi2014-08-091-5/+18
|\ \ | |/ |/|
| * Define FLAG_BEACON in android.media.AudioAttributesJean-Michel Trivi2014-08-081-5/+18
| | | | | | | | | | | | | | | | | | | | Define FLAG_BEACON as @SystemAPI Keep track of which flags are public, and the list of all supported flags for easier code maintenance. Bug 15415971 Change-Id: Ia7675e8fa4bc7c4d7a8f727fd25ff92ecb68483c
* | Added Tunneled video playback support to MediaCodecRachad2014-08-092-4/+14
| | | | | | | | | | Bug:16132368 Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
* | Merge "TIF: introducing TvInputSettings for put/getting user preferences ↵Dongwon Kang2014-08-081-2/+169
|\ \ | | | | | | | | | from Settings." into lmp-dev
| * | TIF: introducing TvInputSettings for put/getting user preferences from Settings.Dongwon Kang2014-08-081-2/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: - Settings.Secure.ENABLED_INPUT_METHODS - InputMethodSettings Bug: 16876078 Change-Id: I72c1770517052188694f21c10da383338edc8ee2
* | | TIF: fix a regression introduced while addressing merge conflict in TISDongwon Kang2014-08-081-33/+35
|/ / | | | | | | | | | | | | | | Plus, a small code refactoring on DO_CREATE_SESSION for lower indentation depth. Bug: 16833301 Change-Id: Id0cb2df26015ea8286a1cf03024c44fa15f2628e
* | Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-devRoboErik2014-08-085-286/+260
|\ \
| * | Combine MediaSession Callback and TransportControlsCallbackRoboErik2014-08-075-286/+260
| | | | | | | | | | | | | | | | | | | | | | | | This combines them into a single Callback class and adds default handling to media buttons to check the available actions and call one of the other methods if appropriate. Change-Id: If9897d8cf6d8d8046aa85a646c22382f1db1461b
* | | Merge "Change URI type metadata back to text" into lmp-devRoboErik2014-08-061-4/+3
|\ \ \ | |/ /
| * | Change URI type metadata back to textRoboErik2014-08-071-4/+3
| | | | | | | | | | | | | | | | | | | | | Was accidentally changed in a previous CL. We decided against adding the URI type. Change-Id: Ifccf0e784d3fe3196e80cca238de6f8c4456e85e
* | | Unhide MediaMetadata.DescriptionRoboErik2014-08-081-15/+57
| | | | | | | | | | | | | | | | | | | | | This unhides the method and inner class for getting a small version of the metadata for display. Change-Id: I22f484cecd5f0630ac22bb648baad842d211d135
* | | Merge "TIF: Make TvContract URI consistent" into lmp-devJi-Hwan Lee2014-08-071-54/+56
|\ \ \ | |_|/ |/| |
| * | TIF: Make TvContract URI consistentJi-Hwan Lee2014-08-081-54/+56
| | | | | | | | | | | | | | | | | | | | | | | | - input/*/channel -> channel?input=* - channel/#/program -> program?channel=# Bug: 16806157, Bug: 16804331 Change-Id: Idbded032da166e789148c4b8e38ea521468fd9fa
* | | Update exception handling for MediaCodecAndy Hung2014-08-082-75/+117
|/ / | | | | | | | | | | | | | | | | | | Throw MediaCodec.CodecException (versus IllegalStateException). Print out status error codes as found (See MediaError.h for details). Update error code mapping to CryptoException. Bug: 12034929 Bug: 13976475 Change-Id: I23b951cb06807413f087c238a1d3526659f06e7b
* | Fix track sample rate limitAndy Hung2014-08-081-1/+1
| | | | | | | | | | | | | | | | | | Should be controlled by SAMPLE_RATE_HZ_MIN and SAMPLE_RATE_HZ_MAX. Associated with testing the following sample rate bugs. Bug: 12979141 Bug: 15933066 Change-Id: Id130613fe28c7a1070e42f9bc44ed3b00a4113a3
* | media: update to reworked media codec list/infoLajos Molnar2014-08-071-47/+82
|/ | | | | Bug: 11990470 Change-Id: I884d656f6a325f7074a89d09601ad19363daa8a0
* TIF: Change CEC specific names to more general onesJae Seo2014-08-076-55/+48
| | | | | | | | | Now MHL device information is also a part of HdmiDeviceInfo (previously HdmiCecDeviceInfo). This change adjusts method/variable names across our code base to reflect that. Bug: 16215362 Change-Id: I7a6692329f39842a4aec9a4ff036eca5474cfd33
* Allow media projections to create public presentations.Michael Wright2014-08-072-6/+17
| | | | Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
* Add setting to disable automatic USB audio routingGlenn Kasten2014-08-071-0/+11
| | | | | Bug: 16381952 Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
* TIF: Do not log non-searchable channel watch historyJae Seo2014-08-071-4/+6
| | | | | Bug: 16798476 Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
* Merge "ImageReader: fix documentation, relax some guarantees" into lmp-devLajos Molnar2014-08-071-17/+21
|\
| * ImageReader: fix documentation, relax some guaranteesLajos Molnar2014-08-061-17/+21
| | | | | | | | | | | | MediaCodec does not guarantee any of this. Change-Id: Id73c917baad9ca72de87b98c16374505c8028e86
* | TIF: Add system API 'isSingleSessionActive()'Terry Heo2014-08-072-0/+15
|/ | | | | Bug: 16498558 Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
* Rename HdmiCecDeviceInfo into HdmiDeviceInfo.Jungshik Jang2014-08-073-19/+19
| | | | | | | | | In order to include mhl device info to device info, rename HdmiCecDeviceInfo into HdmiDeviceInfo. BUG: 16215362 Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
* Make caption setting consistent across sessionsYoungsang Cho2014-08-071-0/+9
| | | | Change-Id: I7cb8ab109188b9f78cceb1025339bce98c776052
* Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and ↵Yao Chen2014-08-062-3/+38
|\ | | | | | | getExtras() to MediaController" into lmp-dev
| * Adds getServiceComponent() to MediaBrowser, getQueueTitle() andYao Chen2014-08-062-3/+38
| | | | | | | | | | | | getExtras() to MediaController Change-Id: I6092ac1ae05ba55c14a042698bb88bd16e9b1fa7
* | Merge "AudioSystem: add API to query audio HW sync source" into lmp-devEric Laurent2014-08-062-2/+13
|\ \
| * | AudioSystem: add API to query audio HW sync sourceEric Laurent2014-08-052-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method to query from the audio HAL the HW sync source used for a given audio session. Add an AudioAttributes flag to request an output with HW sync source. Bug: 16132368. Change-Id: Ic31b2924b98f242c3aa0d58688879f05ea02d6f7
* | | TIF: Add a content rating system for BrazilSungsoo Lim2014-08-061-16/+84
| |/ |/| | | | | | | | | | | | | | | | | | | - Add Brazil TV content ratings - Remove Italy TV content rating since it doesn't have the official one. References: http://en.wikipedia.org/wiki/Brazilian_Advisory_Rating_System http://portal.mj.gov.br/services/DocumentManagement/FileDownload.EZTSvc.asp?DocumentID=%7B25A80220-B0E3-47FD-923F-246B6184C3C6%7D&ServiceInstUID=%7B59D015FA-30D3-48EE-B124-02A314CB7999%7D Change-Id: Ibed9b4be0871b50b9dcd95be3a015f5a1e58676d
* | Merge "TIF: Add content ratings for Australia" into lmp-devSungsoo Lim2014-08-041-11/+66
|\ \
| * | TIF: Add content ratings for AustraliaSungsoo Lim2014-08-061-11/+66
| | | | | | | | | | | | | | | | | | Reference: http://www.classification.gov.au/ Change-Id: I79a85124df7e06418ff95ca39ef1db98a83c5af1
* | | Merge "Remove a Handler constructor parameter Looper in TIS" into lmp-devYoungsang Cho2014-08-051-5/+1
|\ \ \
| * | | Remove a Handler constructor parameter Looper in TISYoungsang Cho2014-08-061-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | getMainLooper() returns null in the variable initialization phase. Change-Id: Iebe52eac8955c0a8394501575f90ff6f2825451c
* | | | Merge "Add a method in TIS to relayout SurfaceView" into lmp-devYoungsang Cho2014-08-055-2/+121
|\ \ \ \ | |/ / /
| * | | Add a method in TIS to relayout SurfaceViewYoungsang Cho2014-08-065-2/+121
| |/ / | | | | | | | | | | | | Bug: 15389458 Change-Id: I7f740141e7cf59fea5d321099652e65bc9e5f7d1
generated by cgit v1.1 at 2025-03-30 03:54:01 +0000