3237 Commits

Author SHA1 Message Date
RoboErik
17a1b48629 Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 2014-09-02 16:58:30 +00:00
Jae Seo
65899b1092 Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 2014-09-02 16:20:28 +00:00
Jae Seo
9e85408f12 Merge "TIF: Fix the Singapore content ratings" into lmp-dev 2014-09-02 16:20:10 +00:00
Sungsoo Lim
75f903e123 Merge "Do not show the input icon when it's not available." into lmp-dev 2014-09-02 16:16:02 +00:00
Sungsoo Lim
3633832063 Do not show the input icon when it's not available.
Bug: 17335230
Change-Id: Icb84949ed55f22bb384df9ed4bbfe3d86949c301
2014-09-02 09:13:43 -07:00
Jae Seo
3652e1d8b8 TIF: Fix the Singapore content ratings
It is not that Singapore has two different rating systems. There is just one
rating system from Board of Film Censors but each broadcaster uses a different
subset of ratings. For example, Free-To-Air uses PG and PG13 while Pay TV uses
NC16 and M18 ratings in addition to the PG and PG13.

Bug: 17330613
Change-Id: I5a5e47706e7415f13a5e7dc9c00cc2c3c3763965
2014-09-02 00:30:01 -07:00
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
2014-09-01 23:49:57 -07:00
Jae Seo
d6ae33bd6a TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
Bug: 17331873
Change-Id: Idabeb056ae2105125174d7392dbe4fae614752fc
2014-09-01 23:49:00 -07:00
Wonsik Kim
d71c691bc5 TIF: add SystemApi's for ITvInputHardware related methods
Bug: 17322530
Change-Id: I813d865bc9a77d1d381e52188afac5c5c75a2968
2014-09-02 11:45:35 +09:00
Jungshik Jang
32069a1292 Make stream_music volume configurable.
AV devices including TV have more fine-grained volume control
for media type (audio and video). But audio service allows
only 15 steps for music type.
This change mimics voice calls approach to make music type
volume configurable.

Bug: 17342612
Change-Id: Ic82ff4d74b29963edfe92975000df07244492ae6
2014-09-01 17:51:08 +09:00
Ji-Hwan Lee
774f6c3657 Add missing checks for the current session callback
Bug: 17336320
Change-Id: I4676c4d76d1ed9d22bd476319098cbfcce52cd6d
2014-08-30 16:11:50 +09:00
Rachad
8b63a2bf50 Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 2014-08-30 01:11:36 +00:00
Jae Seo
f7255fcc14 Merge "TIF: Fix comment on TvContentRating" into lmp-dev 2014-08-30 00:51:19 +00:00
Jean-Michel Trivi
c5258433dd Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
For ACTION_HEADSET_PLUG (already in SDK):
 - duplicated definition in AudioManager and moved
  javadoc there. Javadoc in Intent points to AudioManager.
 - the String value is not changed

For ACTION_HDMI_AUDIO_PLUG (being added in SDK):
 - moved defintion from Intent to AudioManager
 - updated String value to reflect package name "android.media"
  instead of using "android.intent"
 - added definition of the extras, but removed "name".

For ACTION_ANALOG_AUDIO_DOCK_PLUG,
    ACTION_DIGITAL_AUDIO_DOCK_PLUG,
    ACTION_USB_AUDIO_ACCESSORY_PLUG,
    ACTION_USB_AUDIO_DEVICE_PLUG, all hidden:
 - moved definition from Intent to AudioManager,
 - changed the value from "android.intent.*" to "android.media.*"

Updated AudioService, UsbDeviceManager and UsbHostManager
 to refer to the actions in AudioManager, not Intent.

Bug 17289385

Change-Id: I61dd73140022d2bb9a676a57f595092c8fa89dcc
2014-08-29 17:29:27 -07:00
Jae Seo
b417c9d0e2 TIF: Fix comment on TvContentRating
Bug: 17332911
Change-Id: Ia2d76b2c6ecf6b804f8b6aa8cec78a243b70e966
2014-08-29 16:13:07 -07:00
RoboErik
2f08888fbe Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev 2014-08-29 22:39:00 +00:00
RoboErik
c692d05951 Update MediaBrowser to use String ids instead of Uris
Since we converted MediaDescription over to using a String media id
for identifying everything we should also use Strings in the browser
service to make it clear that it should re-use that field.

bug:17333205
Change-Id: I5fd5762bdad05068f5b1aa36074306b43432e686
2014-08-29 15:16:19 -07:00
Andrew Jeon
51374011a8 Replace "Comment" to "Description" since description makes more sense in
the context of the java doc.

Change-Id: Id7c2bb76d792680eb6d674cd01290272de723b92
2014-08-29 14:26:53 -07:00
RoboErik
cd74270da7 Document MediaSession.Callback.onMediaButtonEvent and add returns
Documents the return value and makes sure it returns true where
appropriate.

bug:17289717
Change-Id: Ia831a7212b76e8434b745be70da2ed106fa01230
2014-08-29 14:17:13 -07:00
Rachad
c38f9ba81c Tunneled Video Playback:
Fixed missing AudioHwSync for provided Audio session ID

Bug: 17112525
Change-Id: I89509ada88462d4db7fc37007e0ffaea153da5cd
2014-08-28 19:02:20 -07:00
Jeff Tinker
336d3eabc0 Add support for max-res decode
bug: 16034599
Change-Id: I12124aef03518600a27de45bae24eef9c9735be5
2014-08-29 01:42:48 +00:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
2014-08-29 08:58:30 +09:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
Jean-Michel Trivi
d33c3a7765 Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 2014-08-28 22:12:43 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
RoboErik
4fe4facb68 Merge "Set/unset session on the callback" into lmp-dev 2014-08-28 21:29:38 +00:00
RoboErik
5ea924bcdb Set/unset session on the callback
We lost this somewhere. When a callback is set on a MediaSession it needs
to have a reference to the Session so it can do default routing of media
keys.

bug:17304614
Change-Id: I4af82947da790135049d40c5c69c2996f3cc4ccc
2014-08-28 14:19:25 -07:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
2014-08-28 21:11:22 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
John Spurlock
2b29bc4c1c Enhance audio service dumpsys.
- Add device name for keys
 - Add max volume for streams
 - Add missing stream name constant

Bug:16964015
Change-Id: I92facbd8ae49ba299c27bcb10bcf6668fed0d302
2014-08-28 12:20:05 -04:00
Lajos Molnar
dbf1552d52 MediaCodecInfo: allow getting info for secure codec
3 minor fixes:
- return correct codec's info from MediaCodec.getCodecInfo()
- treat required features supported
- make feature spec optional in isFormatSupported

Bug: 17154761
Change-Id: Ie98af35ec16caf48a76358fe178f9cc243abad4f
2014-08-28 06:46:29 -07:00
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
2014-08-27 21:52:07 -07:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
2014-08-27 14:40:02 -07:00
Jean-Michel Trivi
84e18ecd4b android.media.Ringtone: add getter for AudioAttributes
Bug 17290606

Change-Id: I28406080cc1fb6a916b2859d0ef39980464953e9
2014-08-27 14:32:17 -07:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
2014-08-27 16:25:00 -04:00
Eric Laurent
27c30e4426 fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices

Bug: 17298383.
Bug: 16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
2014-08-27 12:36:33 -07:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Ji-Hwan Lee
d0f0058883 TIF: Reset main TvView only for explicit reset() call
Or, do not reset when it's called internaly while tuning.

Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
2014-08-27 02:55:10 +09:00
Jae Seo
b2835e2700 TIF: Make TV content rating names consistent
Bug: 17275999
Change-Id: I79e9ce180b23b37799f0e7daffa7778bff9cd3e4
2014-08-26 10:08:56 -07:00
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
2014-08-26 23:12:59 +09:00
Chulwoo Lee
ffad70bb7e Recreate overlay view after the TIS crashes
The overlay view should be recreated when the session is recreated
after the TIS crash.

Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
2014-08-26 21:30:26 +09:00
Chulwoo Lee
984d99b584 Fix checking trackId
BUG: 17261638
Change-Id: I141b7c9de1289c49f29d2f1e1ac534045abb333d
2014-08-26 11:29:17 +09:00
Jean-Michel Trivi
9e477e4084 More AudioManager.generateAudioSessionId() javadoc
Expand the javadoc for AudioManager.generateAudioSessionId() to
 describe what audio session IDs are used for.

Bug 17059255

Change-Id: I7a8764fd12fa332af747c4d584b0079e80bacf44
2014-08-25 17:55:07 -07:00
Jean-Michel Trivi
2d17128f6e SoundPool.Builder: document default values
Complete javadoc for android.media.SoundPool.Builder to document
 what the default values are.

Bug 17059255

Change-Id: I966e9ed00ed75a78c9b4741b7f68bae996442cdf
2014-08-25 16:48:24 -07:00
Dongwon Kang
f178c14919 Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 2014-08-25 23:44:34 +00:00