8135 Commits

Author SHA1 Message Date
Eric Laurent
eb4b8a27e3 AudioService: wait for init completed to handle media server restart
Bug: 16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f
2014-07-22 11:55:42 -07:00
Youngsang Cho
8433ad9ec1 Minor comment change of TvContract.Programs.COLUMN_TITLE
Change-Id: I6592a0708feafc84cd76585428a9743e8fb2af48
2014-07-22 11:31:00 -07:00
Dongwon Kang
9f7c25ebeb Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev 2014-07-17 22:03:23 +00:00
Dongwon Kang
fe9259e6a7 TIF: Revisit types in TvInputInfo and TvContract.Channels.
For the types in TvInputInfo, TYPE_TUNER represents all the TV inputs
having channels in TvProvider. Also, String is used for the types in
TvContract.Channels for further extension.

Change-Id: Iee1163b449d9f9723ff665178f2967bb8c0ad71d
2014-07-22 16:58:51 +09:00
Yao Chen
e3504260b9 Merge "Updated media browsing API & tests." into lmp-dev 2014-07-18 22:16:50 +00:00
Youngsang Cho
82992fb791 Add season/episode related constants in TvContract.Programs
Change-Id: I8d89157b1fbfea062bba73e2534ab0a27112f010
2014-07-21 21:20:27 -07:00
Yao Chen
17d47989ee Updated media browsing API & tests.
Change-Id: I3a1e3eead99a98b1890e05843dd90203cee517b7
2014-07-21 21:14:43 -07:00
Jean-Michel Trivi
0d964e77b9 Merge "Unhide SoundPool builder with AudioAttributes" into lmp-dev 2014-07-21 15:42:19 +00:00
Jean-Michel Trivi
fb52139bd8 Unhide SoundPool builder with AudioAttributes
Change-Id: I9ec6ca310a342f72cc1a0de5d93fe650b0ca2125
2014-07-21 16:00:43 -07:00
Jean-Michel Trivi
a8a3f55865 New MediaFormat keys for AAC
Decoder:
    KEY_AAC_DRC_ATTENUATION_FACTOR
    KEY_AAC_DRC_BOOST_FACTOR
    KEY_AAC_DRC_HEAVY_COMPRESSION
    KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
    KEY_AAC_ENCODED_TARGET_LEVEL
    KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT
Encoder:
    KEY_AAC_SBR_MODE

Change-Id: I69abe01add135875446914134d93a58815992e07
2014-07-21 16:47:34 -07:00
RoboErik
edb158f55f Deprecate apis that were replaced by sessions
These classes all have new components in the session APIs.

bug:16218444
Change-Id: Ib64ff0e23503e4c9eb2fd9162a878e1eaba7c4df
2014-07-21 18:26:42 +00:00
Jean-Michel Trivi
122f599bb4 Merge "AudioAttributes for SoundPool" into lmp-dev 2014-07-19 22:40:06 +00:00
Jean-Michel Trivi
55a30c41b6 AudioAttributes for SoundPool
Add support for building a SoundPool instance and specify
 the AudioAttributes.
Remove SRC quality which was never implemented, while leaving
 room for supporting it later through the Builder pattern.
Remove stream types.
Update AudioService's use of SoundPool to the new scheme.

Change-Id: Ie51e4008684e5ba25f9b7368098e4f20266a15c7
2014-07-20 18:12:00 -07:00
Jean-Michel Trivi
e9111d3067 Merge "API for audio session ID generation" into lmp-dev 2014-07-19 22:40:06 +00:00
Jean-Michel Trivi
289cc8e887 API for audio session ID generation
Expose the value used by the framework to generate an audio
 session ID when a value isn't known.
Rename allocateAudioSessionId() to generateAudioSessionId()
 as this operation doesn't "allocate" anything, and there is
 no allocated resource to free after this operation.

Bug 16401631

Change-Id: I7a7bc05b39ea0b024ff225254eb755a9c85a2ad9
2014-07-20 11:25:48 -07:00
Alan Viverette
bfe76f4547 Fix docs build error in MediaFormat
Change-Id: I5faf72efa1a792f9a500eb4abc76d4e4cda5516d
2014-07-21 19:37:17 -07:00
Ji-Hwan Lee
4f9f57cede TIF: Extend multiple TV input per service for HDMI logical devices
Remove ITvInputManager.registerTvInputInfo() and let addTvInputInfo*()
cover the registration.

Bug: 15570939
Change-Id: Ic36701de96696e7fe32fc1faa0d5f6fde53f6666
2014-07-21 17:04:04 +09:00
Jae Seo
a759b111a1 TIF: Add sendAppPrivateCommand()
Added a way to send a private command from the application to the TV
input. This can be used to provide domain-specific features that are
only known between certain TV inputs and their clients.

Change-Id: I7548311a64147b8ff27562ec680b941e2ec10bc0
2014-07-20 19:16:15 -07:00
Jean-Michel Trivi
dfa871620c Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev 2014-07-18 18:24:25 +00:00
Youngsang Cho
4350a6210f TIF: update documentation of TvInputInfo.getParentId()
Change-Id: I5c0733d28621486ec0ff0f093c22eb1cc05f785d
2014-07-21 00:13:03 +00:00
Jean-Michel Trivi
9b9d72fd11 Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
Bug 16401631

Change-Id: I522e7c7030a71b528a484d4d8ae517b4b09460bf
2014-07-20 16:53:27 -07:00
Jean-Michel Trivi
3d63a9c7cd Merge "Add AudioAttributes to stream type conversion" into lmp-dev 2014-07-17 17:59:02 +00:00
Jean-Michel Trivi
09818c1550 Add AudioAttributes to stream type conversion
Framework internal conversion for going from an AudioAttributes
 instance to a legacy stream type.

Change-Id: Ic3b7d2cf4aa0ac5255aa5897a25c78c940af9f77
2014-07-18 17:55:00 -07:00
Jean-Michel Trivi
7cdc0b58d6 Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 2014-07-18 18:24:25 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
2014-07-18 17:07:04 -07:00
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
Wonsik Kim
61acf46d6a Merge "TIF: revise API names" into lmp-dev 2014-07-17 21:07:39 +00:00
Sungsoo Lim
9bf671f8ee TIF: revise API names
- TvInputManager: TvInputCallback -> TvInputListenter
- TvParentalControlManager: ParentalControlCallback -> ParentalControlListener
- TvView: unblockContent -> requestUnblockContent

Change-Id: I58220e86a4e59ee7d8f28fab833f09cd603b1e38
2014-07-19 21:22:16 +09:00
Wonsik Kim
6b11ea1ab1 Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 2014-07-17 21:07:39 +00:00
Dongwon Kang
1034df8c63 TIF: Reorder TvInputInfo types from old to new.
This change is internal cleanup change. The purpose of this change is
to reorder the types so that new types can be added at the end of the
type list later.

Change-Id: I377c98dc397ef75c3473ee5133b2ffb49d278a50
2014-07-19 18:48:32 +09:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
2014-07-19 02:14:00 -07:00
Jean-Michel Trivi
89435ce612 Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev 2014-07-17 17:59:02 +00:00
Jean-Michel Trivi
89c3b29a9b Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
AudioAttributes: rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE to
  USAGE_NOTIFICATION_RINGTONE in the list of usage values.
Temporarily keep the old definition to prevent transient build
  breakages, will be removed after telephony packages have been
  updated.

Bug 16401631

Change-Id: I9398443fd7ba3c30e9d371c5c5a2934b9ea6f30a
2014-07-20 20:58:47 +00:00
Wonsik Kim
7f4342e5b8 audio: fix too early connection to HdmiControlService
Connect to HdmiControlService on systemReady(), not on constructor.

Change-Id: Ic91467f040fbffa48393e876997bd320ae9500db
2014-07-20 22:13:54 +00:00
Dongwon Kang
4b662d1b98 TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
This change adds a class which will be used for the TV input which controls an external device
which is connected to the pass-through TV input.

Bug: 15496325
Change-Id: I52d48c45570c2d62d759a9da2ab96ec8461c13f7
2014-07-19 13:36:07 +09:00
Jae Seo
31380e8424 Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 2014-07-18 18:24:25 +00:00
Jae Seo
bbcd206a79 TIF: Add a way to notify whether the current program content is allowed
Now we have a complete set of API to tell the entire cases (allowed and
blocked), which makes possible for the application to rely more on
actions taken by TV input services transferring the responsibility for
parental control.

Bug: 13172379
Change-Id: I7b0dcf16b870782c76a428a1dac6ef1a528b7d40
2014-07-18 17:13:07 -07: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