8096 Commits

Author SHA1 Message Date
Jean-Michel Trivi
044a5f51e5 Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 2014-07-17 21:58:28 +00:00
Jean-Michel Trivi
0daab220b2 Hide AudioManager.startBluetoothScoVirtualCall()
Not intended for public consumption.

Bug 16401631

Change-Id: I299a4719fef57a66a428ccf1902aefaf59d7e064
2014-07-18 16:47:25 -07:00
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode()
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
2014-07-18 21:34:39 +00:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Jaewan Kim
903d6b72cd TIF: Add unblock content
When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.

If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.

Bug: 13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
2014-07-18 11:11:38 -07:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
2014-07-18 15:35:25 +09:00
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
2014-07-18 12:00:20 +09:00
Youngsang Cho
2b8aa9903a Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
abebf6df87 TIF: Change the parameter of TvInputInfo.loadLabel/Icon
Labels and icons will be extracted from URI in the future.
To acheive it, we need Context rather than PackageManager.

Bug: 16166859
Change-Id: I20f0506fba5876a6cf21b70e44bb3a2265f723d7
2014-07-17 17:49:29 -07:00
Wonsik Kim
61635036ac Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev 2014-07-17 21:11:29 +00:00
RoboErik
ca58ddf7c8 Fix crash when calling MediaSession callback
bug:16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
2014-07-18 01:40:09 +00:00
Wonsik Kim
187423c0bc TIF: one-to-many relationship for TvInputService to TvInputInfo
The scope of this change is to provide a skeleton code for supporting
multiple TV input per service.

Bug: 16138420
Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
2014-07-18 09:38:59 +09:00
Youngsang Cho
cdc4e42265 Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 2014-07-17 18:11:21 +00:00
Youngsang Cho
6440db358c TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
TODO: Remove BROWSABLE in TvContract, TvProvider and TV app.

Bug: 16195951
Change-Id: I20e8e1e2f93e0133eba3694e0c1724d443250e59
2014-07-17 20:27:46 -07:00
Youngsang Cho
c66ca1267c Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 2014-07-17 21:58:28 +00:00
Jae Seo
b375805f3b TIF: Add a method to get TvInputInfo for a given TV input
This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.

Bug: 16166859, Bug: 15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
2014-07-17 20:25:01 -07:00
Youngsang Cho
e821d711db TIF: Add a notification for surface change from TvView to TvInputService
Bug: 15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
2014-07-17 17:30:36 -07:00
Jae Seo
5507bd7688 TIF: Add buildInputId()
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.

Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
2014-07-17 20:23:52 -07:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
2014-07-17 14:30:19 -07:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
2014-07-17 16:29:36 -07:00
Jean-Michel Trivi
2e7dd4bfc2 Unhide audio virtualizer capability query methods
Unhide the new method to query the Virtualizer effect implementation
 about its capabilities in terms of input, device support, and
 virtual speaker angles.

Change-Id: I4478f7837efe8c9d52978244a3402c7f8590e585
2014-07-18 08:01:07 -07:00
Ji-Hwan Lee
d811af223e Fix android_system_stubs build
Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850
2014-07-18 21:39:57 +09:00
Dongwon Kang
eea9743ba5 TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
This change adds a way to get a dummy channel for starting pass-through
TV inputs which don't have real channels in TvProvider.
Bug: 15496325

Change-Id: I7a6b99964319f12a0f8692b4e307e03480119a69
2014-07-18 16:24:57 +09:00
Jae Seo
874f95ca73 Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 2014-07-17 16:16:48 +00:00
Ji-Hwan Lee
66bdf247df TIF: Add TvInputInfo.getParentId
Bug: 16166859
Change-Id: I07130b6f974ca7b2527aba68b92dc31fb4b5a139
2014-07-17 14:40:31 +09:00
Chulwoo Lee
5130655bcb Merge "Pass input ID to the setup/settings activity" into lmp-dev 2014-07-17 04:18:22 +00:00
Chulwoo Lee
3b2f507910 Merge "Introduce "input_id" column to the channels table" into lmp-dev 2014-07-17 04:15:25 +00:00
Jungshik Jang
12307ca810 Revisit HDMI-CEC system audio mode in AudioService.
From recent feedback on HDMI-CEC system audio mode,
it would be unnecessary to enforce output from AudioService.
Instead, it would follow audio policy according to status
of HDMI-CEC system audio mode.
For that removed two params of setHdmiSystemAudioModeSupported
api of AudioManager.

In terms of speaker mute, it will be handled by removing speaker
from audio ouput instead of changing gain control. For that
added new force usage type, FOR_HDMI_SYSTEM_AUDIO_MODE and
new force config type, FORCE_HDMI_SYSTEM_AUDIO_ENFORCED.
This is used to notify change of system audio mode to
audio policy manager.

Bug: 16305986
Bug: 16002150

Change-Id: I5643ad093a651c951e12b567c6e11b88aa87cea2
2014-07-17 09:27:25 +09:00
Robert Shih
c20533c1a7 MediaRecorder: added constants for WEBM output
Change-Id: Iacbb55bda71bb6da98244255bf2a4c34c7342fb0
2014-07-16 16:06:21 -07:00
Chulwoo Lee
d0d02e22ce Introduce "input_id" column to the channels table
Until now, TvInputService has been providing the channels. But from now
on, a TvInputService can have several TV inputs and the TV input will
provide its channels.
So introduced "input_id" which is the ID of the TV input instead of
"service_name" which designates the TvInputService.
Also updated related APIs.

BUG: 16138420
Change-Id: I1d4dcad17c028384ab75a7f71ee0b305509ae952
2014-07-16 12:19:03 +00:00
Chulwoo Lee
029179d7f9 Pass input ID to the setup/settings activity
In the setup/setting phase, the activities should know their input ID
to access the channels/programs table.

Change-Id: If7afcb0ea474dca08c3dee06cbfcf76191a68660
2014-07-16 20:26:12 +09:00
Lajos Molnar
1e6e8018a4 MediaCodec: add reset() + documentation fixes
Bug: 12034929
Change-Id: I38f89a2e4c41e0ceb3fdae4522b9c04f6c43a4f1
2014-07-15 18:14:04 -07:00
Liejun Tao
f4e51d82d2 AudioService: Use device specific mode to open SCO audio
Bluetooth carkit may need specific mode to open SCO
channel. Add a settings value using BT device's MAC address
to store the SCO mode and use it to open SCO. In case no value
is stored, use default mode: Virtual Voice Call.

Change-Id: Iea31a48be0e8f3bd2d8689635fd8ce6f6d6da15a
2014-07-16 15:50:54 -07:00
RoboErik
ac17c2a8c9 Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev 2014-07-16 16:25:13 +00:00
RoboErik
1ff5b1648a Change adjustVolumeBy to adjustVolume
This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.

Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
2014-07-16 12:03:45 -07:00
RoboErik
8b4bffcac9 Make MediaSession and MediaController constructors public
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.

This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.

Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
2014-07-16 12:03:45 -07:00
RoboErik
71940885f2 Merge "Make MediaSession and MediaController constructors public" into lmp-dev 2014-07-16 13:12:22 +00:00
Jean-Michel Trivi
d70ad7a128 MediaPlayer factory method with audio attributes and session ID
Change-Id: I4e7f633c84c90581e849af2865f5be84a026f32f
2014-07-16 18:36:20 +00:00
Jae Seo
54892c8b81 Merge "Implement TvContentRating" into lmp-dev 2014-07-15 20:35:01 +00:00
Sungsoo Lim
e16873467c Implement TvContentRating
Added a class that represents TV content ratings that are used for
parental controls. TV input services are required to create
TvContentRating objects with rating/sub-rating constants for specific
countries (for now US and KR only) defined in this class and then
convert them into strings in order to store them in the EPG database.

Bug: 13172379
Change-Id: I6200cb12fbc274dd0a8bcb87a8ac3cd2d96791db
2014-07-15 22:11:21 -07:00
Jean-Michel Trivi
79f5cd1429 Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
Unhide MediaPlayer.setAudioAttributes() method.

Update javadoc to explicitly state that the factory methods
  do not let you set the audio stream type, attributes or session.

Change-Id: I0d097c314db010698b035349befe0659ab4d1dde
2014-07-16 14:41:06 +00:00
Jean-Michel Trivi
d2bebb3ab8 DO NOT MERGE Audio virtualizer effect: add support for querying capabilities
Change-Id: Ib62bab6655996575d7703be0bcb55fa8559a68a2
(cherry picked from commit 57fa19dec7150678020e7f1fe6e6879fd9d873f5)
2014-07-15 15:45:16 +00:00
Wonsik Kim
969167dc05 TIF: Revisit availability changes
Bug: 15838097, Bug: 15973274
Change-Id: Ida060696cb6222c8ced576d86c100c25d94dc5c0
2014-07-15 02:58:33 +00:00
Lajos Molnar
7be24522ce MediaExtractor: set buffer offset/limit in readSampleData
also fix setting offset/limit in MediaCodec's getBuffer.

Bug: 13008204
Change-Id: Iadf0f006cfccc2546971cc5384058e1a2721780b
2014-07-15 02:30:32 +00:00
Eino-Ville Talvala
6dc599b995 Merge "MediaRecorder: Fix crash when given a released Camera object" into lmp-dev 2014-07-14 18:37:56 +00:00