8293 Commits

Author SHA1 Message Date
Glenn Kasten
34cc4db180 Move setting to disable automatic USB routing
This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
2014-08-13 13:31:04 -07:00
Chulwoo Lee
81d1b4def0 TIF: Enable to build uri for browsableOnly channels
BUG: 16966138
Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
2014-08-13 12:28:34 -07:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
Sungsoo Lim
a9a29a29e5 Fix hashCode of TvContentRating
Bug: 16963556
Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
2014-08-13 08:32:29 +00:00
Jean-Michel Trivi
81f871e2b9 Add support for AudioAttributes in android.media.Ringtone
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
2014-08-12 15:53:15 -07:00
Jean-Michel Trivi
37d7804627 HDMI plug intent and associated information
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
2014-08-12 17:16:30 +00:00
Sungsoo Lim
1681ac0b69 Add equals method of TvContentRating
Bug: 16963556
Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
2014-08-12 22:48:28 +09:00
Jaewan Kim
22f7c4769f Merge "Treat empty subrating as the same as null subratings." into lmp-dev 2014-08-11 19:46:21 +00:00
Jaewan Kim
d22e37acac Treat empty subrating as the same as null subratings.
Change-Id: Ic288c680c639ccba6cf593d1286776a6c891b726
2014-08-12 22:21:33 +09:00
Sungsoo Lim
6219fa8b2d Add version attribute in tv_content_rating_system.xml
- '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
2014-08-12 21:49:20 +09:00
John Spurlock
77e54d905f Talkback: Ensure TTS stream is not affected by ringer mode.
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
2014-08-12 00:22:44 +00:00
Jaewan Kim
05abff10e3 Ensure that custom label isn't empty
This also changes getHiddenTvInputIds to return mutable ArrayList.

Bug: 16876078
Change-Id: Ib84a071e7a7cf390ac4f9cf69f3d8daf218d657d
2014-08-11 21:01:36 +09:00
Sungsoo Lim
98ea5fa8e4 TIF: Add content rating systems
- 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
2014-08-11 14:44:05 +09:00
Jae Seo
d86eb6f8a4 Merge "TIF: Move watch history logging to TvProvider" into lmp-dev 2014-08-09 00:45:27 +00:00
Jae Seo
7eb75dff7a TIF: Move watch history logging to TvProvider
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
2014-08-10 10:39:52 -07:00
Jean-Michel Trivi
8b72930bc0 Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev 2014-08-09 00:51:24 +00:00
Jean-Michel Trivi
6894cd38eb Define FLAG_BEACON in android.media.AudioAttributes
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
2014-08-08 12:16:12 -07:00
Andy Hung
5f9aa0bcea Update exception handling for MediaCodec
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
2014-08-08 16:15:07 +00:00
Rachad
73fc533b2e Added Tunneled video playback support to MediaCodec
Bug:16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
2014-08-09 01:29:43 +00:00
Dongwon Kang
9dfd731db5 Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 2014-08-08 20:34:05 +00:00
Dongwon Kang
4d933a0ef0 TIF: introducing TvInputSettings for put/getting user preferences from Settings.
Reference:
  - Settings.Secure.ENABLED_INPUT_METHODS
  - InputMethodSettings

Bug: 16876078
Change-Id: I72c1770517052188694f21c10da383338edc8ee2
2014-08-08 21:36:50 +00:00
Dongwon Kang
c566ca54b1 TIF: fix a regression introduced while addressing merge conflict in TIS
Plus, a small code refactoring on DO_CREATE_SESSION for lower indentation
depth.

Bug: 16833301
Change-Id: Id0cb2df26015ea8286a1cf03024c44fa15f2628e
2014-08-08 21:36:38 +00:00
RoboErik
6d9fe654b5 Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev 2014-08-08 17:26:08 +00:00
RoboErik
477d1197c3 Combine MediaSession Callback and TransportControlsCallback
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
2014-08-07 16:54:52 -07:00
RoboErik
217e8a2b46 Change URI type metadata back to text
Was accidentally changed in a previous CL. We decided against adding
the URI type.

Change-Id: Ifccf0e784d3fe3196e80cca238de6f8c4456e85e
2014-08-07 16:54:51 -07:00
Jae Seo
546c635ad9 TIF: Change CEC specific names to more general ones
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
2014-08-07 14:51:19 -07:00
RoboErik
98cb95a998 Merge "Change URI type metadata back to text" into lmp-dev 2014-08-06 23:49:20 +00:00
RoboErik
67098d0963 Unhide MediaMetadata.Description
This unhides the method and inner class for getting a small version
of the metadata for display.

Change-Id: I22f484cecd5f0630ac22bb648baad842d211d135
2014-08-08 17:16:37 +00:00
Ji-Hwan Lee
ca18eb045b Merge "TIF: Make TvContract URI consistent" into lmp-dev 2014-08-07 16:56:07 +00:00
Ji-Hwan Lee
156aeecef2 TIF: Make TvContract URI consistent
- input/*/channel -> channel?input=*
- channel/#/program -> program?channel=#

Bug: 16806157, Bug: 16804331
Change-Id: Idbded032da166e789148c4b8e38ea521468fd9fa
2014-08-08 22:15:00 +09:00
Michael Wright
6720be4e8c Allow media projections to create public presentations.
Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
2014-08-07 20:07:04 +00:00
Andy Hung
9e4a66d696 Fix track sample rate limit
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
2014-08-08 01:38:15 +00:00
Lajos Molnar
cd5e3f95bf media: update to reworked media codec list/info
Bug: 11990470
Change-Id: I884d656f6a325f7074a89d09601ad19363daa8a0
2014-08-07 17:27:20 -07:00
Glenn Kasten
5f51635484 Add setting to disable automatic USB audio routing
Bug: 16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
2014-08-07 10:31:53 -07:00
Jae Seo
579befecb2 TIF: Do not log non-searchable channel watch history
Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
2014-08-07 10:00:52 -07:00
Lajos Molnar
785c9a2ae1 Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 2014-08-07 15:00:45 +00:00
Lajos Molnar
8d563a2077 ImageReader: fix documentation, relax some guarantees
MediaCodec does not guarantee any of this.

Change-Id: Id73c917baad9ca72de87b98c16374505c8028e86
2014-08-06 20:00:10 -07:00
Terry Heo
df9f0a321e TIF: Add system API 'isSingleSessionActive()'
Bug: 16498558
Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
2014-08-07 08:07:17 +00:00
Jungshik Jang
61f4fbd2e8 Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
In order to include mhl device info to device info,
rename HdmiCecDeviceInfo into HdmiDeviceInfo.

BUG: 16215362

Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
2014-08-07 11:14:15 +09:00
Youngsang Cho
5caf1e8dda Make caption setting consistent across sessions
Change-Id: I7cb8ab109188b9f78cceb1025339bce98c776052
2014-08-07 00:48:50 +00:00
Yao Chen
dc33b6170b Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController" into lmp-dev 2014-08-06 17:19:40 +00:00
Yao Chen
51fdfa273e Adds getServiceComponent() to MediaBrowser, getQueueTitle() and
getExtras() to MediaController

Change-Id: I6092ac1ae05ba55c14a042698bb88bd16e9b1fa7
2014-08-06 14:10:41 -07:00
Eric Laurent
b287c9388e Merge "AudioSystem: add API to query audio HW sync source" into lmp-dev 2014-08-06 17:14:55 +00:00
Eric Laurent
b634e1b6d6 AudioSystem: add API to query audio HW sync source
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
2014-08-05 16:56:12 -07:00
Sungsoo Lim
022e7cc298 Merge "TIF: Add content ratings for Australia" into lmp-dev 2014-08-04 23:56:40 +00:00
Sungsoo Lim
1fd38bd996 TIF: Add content ratings for Australia
Reference: http://www.classification.gov.au/

Change-Id: I79a85124df7e06418ff95ca39ef1db98a83c5af1
2014-08-06 15:11:26 +09:00
Youngsang Cho
ac8c3d3358 Merge "Remove a Handler constructor parameter Looper in TIS" into lmp-dev 2014-08-05 00:07:36 +00:00
Youngsang Cho
3d13aec546 Remove a Handler constructor parameter Looper in TIS
getMainLooper() returns null in the variable initialization phase.

Change-Id: Iebe52eac8955c0a8394501575f90ff6f2825451c
2014-08-06 15:44:35 +09:00
Youngsang Cho
ff04ae757a Add a method in TIS to relayout SurfaceView
Bug: 15389458
Change-Id: I7f740141e7cf59fea5d321099652e65bc9e5f7d1
2014-08-06 14:53:28 +09:00
Youngsang Cho
887ad97ebe Merge "Add a method in TIS to relayout SurfaceView" into lmp-dev 2014-08-05 00:03:09 +00:00