8168 Commits

Author SHA1 Message Date
Zhijun He
f7badff8bb CamcorderProfiles: add high speed profile constants
Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
2014-07-25 23:59:06 +00:00
John Spurlock
aa5ee4d65f Volume: Persist unsafe volume playback time.
Instead of warning after every reboot, remember the
playback time after a user confirmation and only
reset after the 20 hour playback threshold.

Bug:16543104
Change-Id: I783358d97b88302a28fe77a8eb88bcd338ef1c87
2014-07-25 17:00:25 -04:00
John Spurlock
543650bb10 Merge "Volume: Show safe media warning in settings." into lmp-dev 2014-07-24 23:36:47 +00:00
John Spurlock
351346092a Volume: Show safe media warning in settings.
If the safe media warning is enabled, make sure
we display it from the new inline slider preference in
Settings (without showing the volume dialog itself).

Also:
 - Update the warning dialog to the new sysui theme.
 - Separate the warning sentences with an additional line.
 - Fix the auto-dismiss timeout.
 - Add a system property to additionally enable the safe
   media warning for testing
 - Add more information to audio service dumpsys.

Bug:15434662
Change-Id: I95fec12c9049bbfdb7ebdf246160e4b12c0c5be3
2014-07-25 11:27:51 -04:00
Dongwon Kang
cfec0fbacb Merge "Remove COLUMN_CONDITIONAL_ACCESS from TvContract." into lmp-dev 2014-07-24 16:04:26 +00:00
Dongwon Kang
94a509b123 Remove COLUMN_CONDITIONAL_ACCESS from TvContract.
It turned out that having this flag in Channels table does not
make sense for some European countries because they scremble the signal
per program basis. Also, the current flag does not fit to the use-case
like 'pay per view'. Decided to remove this in L release because it's not
clear how we will handle the cases raised at this moment.

Change-Id: Ibbf829f331a307ac89a553e00ece18d5958e72b5
2014-07-25 10:19:12 +09:00
Terry Heo
b6437cd0ed TIF: Add @SystemApi to TvStreamConfig
To fix broken build of xts

Change-Id: Iefb94c1a7211e6b0a9ae64b78ba6b3999dd8d366
2014-07-25 10:10:47 +09:00
Zhijun He
86c545ea8c MediaFormat: add capture rate key
Change-Id: I2f7dd244d41d52aab6a172ae5df3e1fce3edd694
2014-07-25 00:52:42 +00:00
Sungsoo Lim
f0452adb43 Merge "Call removeOverlayView() before onRelease()" into lmp-dev 2014-07-24 16:04:26 +00:00
Eric Laurent
212532b58e AudioService: implement TV system volume
Implement volume policy for TV devices:
- No ringer mode: never silent
- All stream volumes are synchronized: changing any
stream volume will change the volume for all sources.
- Volume is maintained per output device.
- If a CEC capable HDMI sink is connected, digital volume
is maxed out and volume controls are sent to HDMI sink.

Bug: 15759753.

Change-Id: Ic4c38c749ef0440def9635a1669068ccef02a323
2014-07-24 23:24:26 +00:00
Jeff Davidson
d127367c40 Merge "Fix system API stub build." into lmp-dev 2014-07-24 22:43:15 +00:00
Jeff Davidson
2302049679 Fix system API stub build.
TvInputManager.captureFrame is @SystemApi and depends on
TvStreamConfig which must also be made @SystemApi.

Change-Id: I8a4a10d77d4cfb80674c4ac8aa7a8ed119881aa0
2014-07-24 18:06:56 -07:00
Yao Chen
80bb169d0f Use a sequence number for thumbnail callback.
Change-Id: I27888cd0437b4f654cb29371b7d86b9341d84ae9
2014-07-24 21:40:40 +00:00
Jean-Michel Trivi
f2bbad1e76 Remove MediaFocusControl persisting media button receiver
MediaFocusControl doesn't handle media button receivers anymore,
 so it should read and persist a receiver, and monitor
 package addition/removals.
Also involved a security vulnerability, see bug

Bug 15428797

Change-Id: Ia2be01b20dc4a9820cc0cd3d0605ac03770b266b
2014-07-24 10:06:13 -07:00
Yao Chen
8470857ee4 Fix build
Change-Id: Ia2a09417451dd9cdca0a6351b8ddd00f9195f361
2014-07-25 11:01:45 -07:00
Sungsoo Lim
1295b154c9 Call removeOverlayView() before onRelease()
When the implementation of onRelease() hangs, removeOverlayView()
isn't called. In order to make sure that removeOverlayView() is called,
this CL changes the calling order of removeOverlayView() and onRelease().

Bug: 15097804
Change-Id: I8f998d57488d7bea7c3ba9ece08d6a7adfdebd49
2014-07-24 16:01:58 +09:00
Sungsoo Lim
059e4f6daa Fix typo
Change-Id: Ied87356fae0fff1bc5a0c80223351423a81ea0ce
2014-07-24 17:16:59 +09:00
Ji-Hwan Lee
4c52697dbe TIF: Support HDMI-CEC active source management
Add system API TvView.setMain() and TvInputService.onSetMain().

Bug: 15994065
Change-Id: I60ac24659453ca616380993c4accd8c17e714639
2014-07-24 15:07:43 +09:00
Terry Heo
79124a717c TIF: Enable capturing TV input of TvInputPassthroughWrapperService
Also fixed usage of Log.e() in TvInputService to show stack trace.

Bug: 16441553
Change-Id: I5c160de4a628698907ffd00510d982d597c0ea01
2014-07-24 10:51:23 +09:00
Terry Heo
c086a3df3b Add a frame capture API of TV input
- Added new permission CAPTURE_TV_INPUT

Bug: 15736756
Change-Id: I2ae8b2e3f5b1ad1d525854ed89ab2043cf66acbe
2014-07-24 10:08:45 +09:00
Joe Onorato
69b078599b Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
Change-Id: Ibcaee3f0f8d9ba14f1b002df9c6d4594c6278045
2014-07-23 17:56:57 -07:00
RoboErik
8880157ee0 Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev 2014-07-23 18:56:15 +00:00
RoboErik
a259d35073 Return appropriately scaled artwork to RemoteController
RemoteController has an api to set the artwork size. This adds compatibility
code to do the exclusion or scaling of artwork to be consistent with old APIs.

bug:15618171
Change-Id: I8cc51750c03219d42d5f543419f8b46f9eb5b833
2014-07-23 13:25:02 -07:00
Yao Chen
7e21fe8be9 various fixes in MediaBrowserItem and MediaBrowserService
Change-Id: I57f2a6728eea14ff6243fd68d21886599a5a12f4
2014-07-23 13:15:23 -07:00
Gabriel Peal
f364f94496 Added Action to PlaybackState
Added the ability to discover MediaBrowsers

Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
2014-07-23 11:45:03 -07:00
Gabriel Peal
f0593bc17b Added QueueState, playUri, and playFromSearch.
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls

Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
2014-07-23 11:45:03 -07:00
RoboErik
9db9bf7034 Switch Session APIs over to AudioAttributes
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.

bug:16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
2014-07-23 17:08:32 +00:00
Jae Seo
9adf3dfe19 Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 2014-07-22 16:21:19 +00:00
Jae Seo
15bbf3b220 TIF: Use @SystemApi for APIs that we intend to open to OEMs
Bug: 16374058
Change-Id: Ifdf8188d3791e7e8ab6cc0a30696bde24b16ac5c
2014-07-22 19:58:30 -07:00
Youngsang Cho
008f6d4e32 Block logging watched histories for passthrough inputs
Added a system API TvContract.isChannelUriForPassthroughTvInput

Change-Id: I933482831ae2a8b4d6000c4d16520387b5b6a13f
2014-07-22 22:16:01 -07:00
Youngsang Cho
9d744068f9 Enable customization of TvInputInfo icon/label
TODO: Apply builder pattern to create instances of TvInputInfo

Bug: 16166859
Change-Id: I37ef35e7e463a5ff6612f822fd784b7f299039c9
2014-07-22 22:16:01 -07:00
Lajos Molnar
4b902d72db MediaFormat: add KEY_TEMPORAL_LAYERING
Bug: 14562236
Change-Id: I343d2859e48552d7372fec3b77aea868ff1bfc33
2014-07-22 20:36:05 -07:00
Yao Chen
319f9a979c Add thumbnail related api.
Change-Id: Ifcb06bbaf8f37df367f130124cbcef065fa25766
2014-07-22 17:05:04 -07:00
Youngsang Cho
4350a6210f TIF: update documentation of TvInputInfo.getParentId()
Change-Id: I5c0733d28621486ec0ff0f093c22eb1cc05f785d
2014-07-21 00:13:03 +00:00
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