3196 Commits

Author SHA1 Message Date
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
2014-08-16 04:52:56 +00:00
Andy Hung
2aaed141fa Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 2014-08-16 04:32:18 +00:00
Andy Hung
70b395e8c1 Fix 48kHz limitation on AudioTrack
Changed to 96kHz.

Bug: 12979141
Bug: 17069369
Change-Id: I7643901f6d365d8b46da4872bd2266ec20cb0339
2014-08-18 11:25:22 -07:00
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
2014-08-17 17:59:22 -07:00
Andy Hung
efb3a8b37a Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev 2014-08-15 21:23:40 +00:00
Andy Hung
ad720aeea7 Fix 7.1 audio playback from AudioTrack
Uses AudioFormat.CHANNEL_OUT_7POINT1_SURROUND.

Bug: 16951383
Change-Id: I7e94598d5cae1a741b8b1e0492b202163bf9f9fd
2014-08-15 14:23:06 -07:00
Lajos Molnar
be5e3359b1 Merge "media: minor fixes for MediaCodecInfo" into lmp-dev 2014-08-15 19:14:43 +00:00
Lajos Molnar
981c344ee7 media: minor fixes for MediaCodecInfo
- use equals() for Range singularity checks
- parse max-channel-count properly
- add platform defaults to G711 and GSM audio codecs
- allow xml to override platform limits if format,
  profile or level is not supported (but recognized to be
  possibly valid) by the platform
- set defaut format fields

Bug: 11990470
Change-Id: I06114e2d10dcc205a8a963605a01e6d4f6ecd0f0
2014-08-15 17:35:30 -07:00
RoboErik
78c64cdbd8 Fix crash in legacy apps that register without a looper
Some legacy apps registered their media button receiver in a thread
without a looper. If this happens we need to use the main looper to
prevent a crash.

bug: 16306226
Change-Id: Idf472e649393e2a7ce2a3e1cbb3476003ab17f34
2014-08-14 18:42:54 -07:00
Jinsuk Kim
8960d1b155 CEC: Replace the usage of logical address with id for HdmiDeviceInfo
Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address
as id. This accomodates the identification of MHL device with ease. Also updated
TIF to use id instead of logical address.

Bug: 16986744
Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
2014-08-14 10:52:23 +09:00
RoboErik
1d2a1c917f Merge "Pipe caller's identity through volume methods" into lmp-dev 2014-08-13 01:30:58 +00:00
RoboErik
0dac35af2c Pipe caller's identity through volume methods
setStreamVolume and adjustStreamVolume were always being called
from the session service's uid/package. This adds the plumbing to
allow the original app's info to be passed in to the audio service
when volume is changed.

Change-Id: Ib36639dab1e518b435161dc453c8ba9351df3e9b
2014-08-14 10:21:26 -07:00
Jae Seo
e8deca1a0e Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 2014-08-13 01:30:58 +00:00
Jae Seo
fc27d6db08 TIF: Rename R.attr.contentRatingSystemXml and fix documentation
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
  describes TV content rating, not a component name.
- Replace the DTD with an XML example.

Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
2014-08-14 17:28:07 +00:00
RoboErik
5ca4a78e32 Merge "Post MediaSessionManager callbacks to the caller's thread" into lmp-dev 2014-08-14 16:46:52 +00:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
2014-08-13 15:00:21 -07:00
Dongwon Kang
d4eb10a88d TIF: resolve SecurityException on loadCustomLabel().
Bug: 17001118
Change-Id: I357ac2506562c028116c3e4f6dd611ef2b744d28
2014-08-14 03:43:07 +00:00
Sungsoo Lim
1d11640127 Update Java doc for TV Rating system
Bug: 17007100
Change-Id: Idb3f2184ea6d0421875ccd1e10b7539b3c17080a
2014-08-14 12:24:41 +09:00
Jaewan Kim
e2c83c97fb TIF: Change data type of custom labels and hide inputs
Change-Id: I2783245671a2a2a5500c6f97acf6375f44db8bf4
2014-08-14 01:12:41 +00:00
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
RoboErik
2811dd3372 Remove REMOTE_STREAM_MUSIC references from AudioService
This removes the fake stream from AudioService and cleans up
references to it. Also removes isLocalOrRemoteMusicActive.

bug:15884752
Change-Id: I1c2b57a2f8ba80061313737f254463f4c80ce8c3
2014-08-14 17:23:34 +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
RoboErik
0d194c5e23 Post MediaSessionManager callbacks to the caller's thread
We were just sending them from the binder thread. This makes them
post to the thread that registered the listener.

Change-Id: I27c155099da32f3bc8be6e3851272f0463df498b
2014-08-12 12:22:12 -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
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