8392 Commits

Author SHA1 Message Date
Dongwon Kang
65dc05248e Merge "TIF: Add content rating system for Spain" into lmp-dev 2014-08-05 00:03:09 +00:00
Dongwon Kang
b1caf4d817 TIF: Add content rating system for Spain
References:
 - http://codigodeautorregulacion.rtve.es/senalizacion-de-los-programas/advertencias-opticas/
 - http://en.wikipedia.org/wiki/RTVE

Change-Id: Icdde8a7f8cfb07cc4f768f95ba764ae6a519e347
2014-08-06 11:48:45 +09:00
Dongwon Kang
66b9e91801 TIF: make TvInputService.Session class static
This change would make the developers freely extend the Session class
out of the TvInputService class.

Change-Id: I7dc9501c771a6e4dcfcceeb1b294b95e612596eb
2014-08-06 11:15:30 +09:00
Youngsang Cho
bf0a4eb158 Add system APIs to set Z-order of TvView
Bug: 16723028
Change-Id: I43c840ca2065920360859f8814a0c76ab2937ac1
2014-08-06 10:01:08 +09:00
Sungsoo Lim
8811f3457e Merge "TIF: Add content ratings for Netherlands" into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
3596a9645e TIF: Add content ratings for Netherlands
Change-Id: I17bac9587ea549f5e22bfe9c03fa50999fee5d5f
2014-08-06 09:26:50 +09:00
Sungsoo Lim
2df7e30839 Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
39ddf8ddc4 Merge "TIF: Add content ratings for Germany" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
6b444eed2c TIF: Add content ratings for Germany
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
2014-08-06 09:29:58 +09:00
Sungsoo Lim
f0bcee493d Merge "TIF: Add content ratings for France" into lmp-dev 2014-08-04 23:56:40 +00:00
Sungsoo Lim
4acc7c3f4e TIF: Add content ratings for France
Change-Id: Ib90a9ab918a6a7187a05323fe0f0122ffe747add
2014-08-06 09:00:53 +09:00
Dongwon Kang
e377ea5de6 Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
b4bbfbcef3 TIF: Add a content rating system for Brazil
- 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
2014-08-06 21:33:56 +09:00
John Spurlock
5f72e16847 Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev 2014-08-05 00:35:13 +00:00
John Spurlock
4f0f120316 AudioService: getMasterStreamType -> RING on tablets.
Since all service-internal checks use stream alias, and the alias
for NOTIFICATION is RING, even on tablets.

This is a followup to ag/506532.

Ensure that #getMasterStreamType always follows the stream_system
alias, and update the system alias for tablets per the new policy.
Update the associate javadoc comment in AudioManager to make this
clear.

Note: there is now no difference in the alias maps between phones
and tablets.

Also fix a condition affected by this in VolumePanel.

Bug:16626879
Change-Id: I2700a48d2a3e7703607f771a1ab7f325596fd789
2014-08-05 16:23:14 -04:00
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00:00
Jean-Michel Trivi
fe3e10deaf Merge "AudioAttributes: implement hashcode and equals methods" into lmp-dev 2014-08-05 00:39:51 +00:00
Jae Seo
dfab517fb2 Merge "TIF: Make selected tracks identifiable" into lmp-dev 2014-08-04 23:42:57 +00:00
Jae Seo
10d285ac06 TIF: Make selected tracks identifiable
A recent change on the multi-track API surfaced an issue that it's hard to
identify selected tracks from the list of tracks obtained from
TvView.getTracks() method, especially when two or more tracks convey the same
track information (e.g. two English stereo audio tracks with the same sample
rate). This change introduced a new public method getId() in TvTrackInfo that
returns an ID with which one can identify the tracks uniquely. It also led to
minor signature changes across the multi-track API to make it more
developer-friendly in both application and TV input service developers'
perspectives.

Change-Id: I226f75e697b0ce52b44db7471660f6d9f646f6f9
2014-08-05 12:06:49 -07:00
RoboErik
75847b98f3 Add display metadata and change strings to CharSequences
This adds some fields for display purposes to MediaMetadata and also
makes the default for all text CharSequence instead of String. Also
adds a hidden method for getting a Description for the metadata.

bug: 11708293
Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
2014-08-05 14:30:27 -07:00
Jon Eklund
43cc8bbbbd Add support for line out audio device
Change-Id: I48750511b56a2bc5f06b7bdd11cfb4e0cd2728af
2014-08-05 20:27:40 +00:00
Sungsoo Lim
f128dbf076 Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
e6dca2cfa4 TIF: A preliminary CL to add multiple rating systems
TODO: Add rating systems for the countries defined in this CL.

Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
2014-08-05 17:35:38 +09:00
Dongwon Kang
1f81b1040f TIF: make the documentation consistent.
Change-Id: Iaf93c8753c43fa128b464cea3f63a38fb7b3c8b3
2014-08-05 15:49:43 +09:00
Wonsik Kim
8e45a33ca8 TIF: implement setVolume for hardware inputs
Bug: 16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
2014-08-05 10:33:08 +09:00
Eric Laurent
d3b8223377 SoundTrigger API update.
Add sound model update callback.
Add native service state change callback.
Add vendor UUID in sound model description.
Add coarse confidence level in recognition event.
Add capture format in recognition event.

Bug: 12378680.

Change-Id: Id63437819ec7b9a4a69e1ff6185b747e20cad95e
2014-08-04 16:35:27 -07:00
Sungsoo Lim
732be11cef TIF: Remove countryCode in TvContentRating
In the standard TV content rating systems, there are no cases that
a TV content rating system is used for multiple countries.
Moreover, since we allow the case that the country code is null for
a custom rating system (e.g. YT), the country code should be removed.

Change-Id: I79472dbd491aa7efb40f3e081f90b45e13a91505
2014-08-04 16:46:42 +09:00
Dongwon Kang
bd2fa2c02d TIF: Rearchitecting TvInputPassthroughWrapperService.
This change addresses the following issues raised in the API review:

TvInputPassthroughWrapperService needs to be rearchitected:
-- Create a nested class (possibly called RemoteTvInput) inside TvInputService that
   represents remote connection to the underlying physical TV input (HDMI).
   RemoteTvInput which will need to have additional method like createRemoteSession.
-- This class has methods to control that remote input, and a callback so TvInputService
   to observe state changes.
-- Add TvInputService.onGetParentInputId() (no argument) which returns null by default.
-- Extend TvInputService.onCreateSession(String inputId, RemoteTvInput parent) to pass
   in the RemoteTvInput requested by onGetParentInputId(), if any.

Bug: 16542165
Change-Id: Ic6b0c9b5d770c9d1f9377061af8dcb6bae0cb9dc
2014-08-04 11:44:45 +09:00
Jean-Michel Trivi
e9c19a5a8e AudioAttributes: implement hashcode and equals methods
Change-Id: I3245c38d9413ba7590811a038db54628424a420e
2014-08-01 18:07:54 +00:00
Eric Laurent
9aa499ac42 Merge "unhide AudioFormat getters" into lmp-dev 2014-08-01 02:00:00 +00:00
Jean-Michel Trivi
cc58c76cf0 AudioAttributes: always build formatted tags from tag array
An AudioAttributes instance can either be built through the
 Builder, or from unmarshalling: the mFormattedTags field
 should always be in sync with the array of tags.
In toString() method, use the more compact mFormattedTags.

Change-Id: Ie06cd7758bf4f2d2693fedaa8c3ba4245802d921
2014-08-01 17:51:46 +00:00
Jeff Tinker
8694f24432 Merge "Allow device to be unprovisioned" into lmp-dev 2014-08-01 13:40:04 +00:00
Jeff Tinker
6bf5b600d6 Allow device to be unprovisioned
bug: 12247651
Change-Id: Ie2e77566d2c65925091296da5bcbec327985c946
2014-08-01 17:16:01 +00:00
Wonsik Kim
ca17a9029d TIF: allow TIS to override default sink from audio policy
Bug: 16635576
Change-Id: I995cfca084950f96675aeb086c5055f76d1c4752
2014-08-04 11:26:56 +09:00
Eric Laurent
0498269c00 unhide AudioFormat getters
Bug: 12378680.
Change-Id: Ibe49c6386b12159e705f49f323cae27b6e2d749a
2014-07-31 17:12:53 -07:00
Mike Lockwood
2754fd0cd3 Add toString() methods to some audio classes to help with debugging.
Change-Id: I2b61d8cdfbcaa7671705771325205b074c50ab1e
2014-07-31 16:50:02 +00:00
Sungsoo Lim
2d99826605 Merge "TIF: Use XML file for representing TvContentRating" into lmp-dev 2014-07-24 16:04:26 +00:00
Sungsoo Lim
5c5b83fcd5 TIF: Use XML file for representing TvContentRating
This change addresses the following API council feedback.

- Remove all constants from TvContentRating. Instead this class becomes a
  general parser for a tuple of "rating domain"+type+subtype(s).
- Instead of constants in the API, the rating definitions should come from
  parsed XML meta-data tied to a TvInputService entry in the AndroidManifest.
  This XML should define a ranked order of the rating constants along with
  @string references for displaying in the Settings UI.  Mention that the
  "rating domain" should be scoped similar to a package name, for example
  "com.youtube.ratings".
- For system-defined rating types (like US, Korea, etc) we should parse this
  same XML format, but it may come from a hard-coded XML resource (since they
  aren't tied to a single TvInputService.)
- Thoroughly document the built-in supported types in javadoc on TvContentRating.

Change-Id: I0a9526c73c8ca67fd0eeac63f3c63c05657a45e3
2014-08-01 13:47:28 +09:00
Sungsoo Lim
1a6b25eabc TIF: Add a parameter (Bundle params) of tune method
- tune(Uri, Bundle) is added as a system API.

Bug: 15809017
Change-Id: I50bc9b510f469ac3c157f095ccfe27d1cd1d9854
2014-08-01 15:33:32 +09:00
Jae Seo
d5ce975952 TIF: Make TvTrackInfo methods more explicit.
This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
   strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
   types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
2014-07-31 16:15:51 +09:00
Wonsik Kim
8750dbca94 Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev 2014-07-25 11:19:20 +00:00
Lajos Molnar
bacc82a509 MediaCodec: clean up image/buffer caching
- cachedBuffers will be null in async mode
- track dequeued buffers in a map
- free dequeued buffers & bytebuffers

Bug: 14297827
Bug: 11990118
Change-Id: I9f8255921de25d05bf2c11fdaeda45cc185b9dd7
2014-07-30 23:06:11 -07:00
Wonsik Kim
21aa3467cd TIF: fix TvInputHal bug for multiple devices
In addition, add toString() method to TvStreamConfig for easier
debugging.

Bug: 16561829, Bug: 16666251
Change-Id: Ic192aef30f4d193b73bac7bc93a1563aa9af4377
2014-07-31 11:05:34 +09:00
Yao Chen
4056871031 Adds toString() in MediaBrowserItem
Bug: 16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab
2014-07-30 15:36:25 -07:00
Chong Zhang
cad266aad9 fix for MediaCodecList bitrate range exception
Bug: 16627391

Change-Id: I8c5ba580d7b875d1e2a0ebbf398cf65dd5c4555f
2014-07-30 20:15:03 +00:00
Youngsang Cho
71b282fad4 TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input
Bug: 14254494
Change-Id: Ieb6b0cb95a366995c7b85beea7eb9ca8507d5531
2014-07-31 13:29:31 +09:00
Youngsang Cho
9bae97685b Merge "TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch" into lmp-dev 2014-07-24 16:04:26 +00:00
Youngsang Cho
d6f7666c77 TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch
Change-Id: Ib178cc7362eb82c0a9f777a1616c9e2943fee7a8
2014-07-30 16:23:07 +09:00
Jae Seo
783645e99f TIF: Merge TvParentalControlManager into TvInputManager
This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
   action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
   TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
   loaded at boot by your internal system service.  It should _not_ be stored in
   a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
2014-07-30 15:39:39 +09:00
Jae Seo
6e62a1508c TIF: Use more consistent constant names
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
2014-07-30 11:46:41 +09:00