Commit Graph

6863 Commits

Author SHA1 Message Date
Chong Zhang
625e180454 MediaCas: combine openSession methods
Combine the two openSession methods into one that doesn't take
any arguments. This gives the client more flexibility in creating
sessions, they can better control how to share sessions across
different elementary streams.

bug: 22804304

Change-Id: I95ce75476b19e9ca851c40f873f46d5c7fa583ef
2017-04-11 13:13:28 -07:00
Chong Zhang
addc39ec27 MediaCas: address comments for API reviews
- Wrap session id byte array in Session object

- Move session operations from MediaCas to Session

- Remove position prarameters on descramble() method

- Retrieve cas info for a track by getCasInfo() instead
  of getDrmInitData().

bug: 22804304
bug: 36791613
bug: 36783335

Change-Id: Ib3ad8d6a2f679c0e60d2bb025ac5999339722306
2017-04-11 13:13:22 -07:00
Paul McLean
3b3ed7af3b Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations.
Bug: 33627517
Test: CTS and Manual
Change-Id: Ic27d630d27efef48fc0d1db023aaec556e62e073
2017-04-11 12:52:05 -07:00
Conrad Chen
558acf96db TIF: add TvInputManager methods to notify apps
Adds TvInputManager methods to notify apps with protected broadcasts
for:
1. Disabling browsable state of preview and watch next programs.
2. Adding preview programs to watch next programs.

Test: build and verify manually to check if notifications are
      broadcasted.
Bug: 35881266

Change-Id: I20fd5b63f42b2c74277315bbbd251b71c649e5c1
2017-04-11 12:03:04 -07:00
Zhijun He
017f4870a1 Merge "ImageReader/Writer: add usage flag support" into oc-dev am: 96d4ac0cc6
am: 4e1b44b4e1

Change-Id: Ibac93b68bb2dd5461bac5d818d25fcbd0d455425
2017-04-11 16:43:46 +00:00
Zhijun He
916d8ac650 ImageReader/Writer: add usage flag support
Also add an ImageWriter ctor to take additional arugment (format)

Test: ImageReader and Writer CTS tests
Bug: 32766711
Change-Id: I99e3862dd5b9a85c9df7879c14c84b68a35718ec
2017-04-10 23:38:32 +00:00
Wei Jia
66acecdb03 Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev am: e79081aeaa
am: 1dccc5841d

Change-Id: I06503dd272057c20d6ba2cdf4f2410d3030491ba
2017-04-08 00:42:54 +00:00
TreeHugger Robot
e79081aeaa Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev 2017-04-08 00:24:12 +00:00
Wei Jia
ae3e7067ef MediaPlayer: add 2 more info notifications for playback error
Test: mediaplayer doesn't send error notify to client when only one track has error.
Bug: 24761723
Change-Id: I7221dfdbc6a256532186c654406bbe06de831798
2017-04-07 15:24:50 -07:00
Wei Jia
e1a76bb7b3 Merge "MediaPlayer: hide BufferingParams API" into oc-dev am: 4c2a62edb6
am: 2c51d55fcc

Change-Id: I031b205a5244f4dab5d5f7904c86badd95e31d18
2017-04-07 22:01:05 +00:00
TreeHugger Robot
4c2a62edb6 Merge "MediaPlayer: hide BufferingParams API" into oc-dev 2017-04-07 21:46:40 +00:00
Dongwon Kang
c09571ba26 Merge "Add intent to intialize programs on APP installed" into oc-dev am: 9c1e85384e
am: 2b45152532

Change-Id: Idfafd349f7c03c183cf8bc7b49097ec735d36225
2017-04-06 23:39:43 +00:00
Dongwon Kang
9c1e85384e Merge "Add intent to intialize programs on APP installed" into oc-dev 2017-04-06 22:49:50 +00:00
Jeff Tinker
0ccaa4afda Merge "Fix StringDef usage in MediaDrm API" into oc-dev am: d2b1f3812c
am: 4b1a00ed84

Change-Id: I76c1568e4617887d65305bd8dbc62f1d1e95f178
2017-04-06 19:49:02 +00:00
TreeHugger Robot
d2b1f3812c Merge "Fix StringDef usage in MediaDrm API" into oc-dev 2017-04-06 17:50:27 +00:00
Wei Jia
f3d93a0f69 MediaPlayer: hide BufferingParams API
Test: compiles
Bug: 36280094
Change-Id: I52f3e71fb0e090ac48711bbb8ea7cbdf8db00074
2017-04-06 10:09:05 -07:00
Conrad Chen
1f6d4b5c81 Add intent to intialize programs on APP installed
Adds a new broadcast intent for system APPs to send when some TV APP met
certain requirements is newly installed. The intent will wake up the APP
and notify it to initialize its channel and program list to the system
provider.

Test: build
Bug: 34739955
Change-Id: Ib172b40434db4a439ec0db7bf8b28037d0bfb8a8
2017-04-06 08:42:59 -07:00
Jeff Tinker
c0f83f39cf Merge "Clarify MediaDrm#getKeyRequest docs: init and mimeType" into oc-dev am: 2375cd1a84
am: 99030a938c

Change-Id: I3f1475e6d906af3d918dcdd63dbace15672e1a34
2017-04-06 06:34:02 +00:00
TreeHugger Robot
2375cd1a84 Merge "Clarify MediaDrm#getKeyRequest docs: init and mimeType" into oc-dev 2017-04-06 06:21:06 +00:00
Jeff Tinker
47e13eeb77 Merge "Update MediaDrm documentation for provideKeyResponse" into oc-dev am: ff8bf0cc95
am: d506056de8

Change-Id: I9de1c14653a8284288eeb99e1a1605db15531ae0
2017-04-06 06:20:18 +00:00
Jeff Tinker
0ca35ac9f0 Fix StringDef usage in MediaDrm API
Remove @StringProperty and @ArrayProperty annotations

bug:32137960
Change-Id: Id8fac0b18f9e663f235f7f8ae8ac8b1240657df0
2017-04-05 09:00:42 -07:00
Jeff Tinker
d8ffd7dffe Clarify MediaDrm#getKeyRequest docs: init and mimeType
MediaDrm getKeyRequest works fine even if init and mimeType
parameters are null when releasing or renewing a key.

bug: 33375079
Change-Id: I707874c8f4f26bf8b23b270331680f69833ae14f
2017-04-05 08:27:14 -07:00
Jeff Tinker
2bc391f567 Update MediaDrm documentation for provideKeyResponse
The documentation for MediaDrm#getKeyResponse says null is returned from
provideKeyResponse for requests of type streaming or release. This corrects
the documentation to indicate that an empty byte array is returned.

bug: 36093612
Change-Id: I2e4fc658d68d827b8a42fb7fa3ef30e35ee51dcf
2017-04-05 07:40:29 -07:00
Conrad Chen
a5a6912095 TIF: add review rating columns to programs
Test: build
Bug: 27526615
Change-Id: I882a87df94a368098d980d42f4bccb933a70996a
2017-04-04 13:01:18 -07:00
Dongwon Kang
2b4465cee2 Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev am: 8d84e4cd1c
am: 9ecff180af

Change-Id: Ia3a31f0c20273fb1fe0fd230c0544a46af54f9d6
2017-04-04 19:48:20 +00:00
Jean-Michel Trivi
f52ef25a43 Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev am: 6cf445bd3d
am: f81f4c09b6

Change-Id: Id0163eb6545d772bb13ade341064310bcd7aed43
2017-04-04 19:39:11 +00:00
TreeHugger Robot
8d84e4cd1c Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev 2017-04-04 19:23:25 +00:00
Jean-Michel Trivi
6cf445bd3d Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev 2017-04-04 19:08:37 +00:00
Jean-Michel Trivi
e4a9911b68 Revert "AudioAttributes: remove static getVolumeControlStream method"
This reverts commit e0b5bf50d6.

Change-Id: I2f3f10c149b205d22c41d5c9767ea10b0dee7682
2017-04-04 18:26:44 +00:00
Dongwon Kang
0a1c6a54d2 TIF: hide BaseProgramColumns and BasePreviewColumns
Note: BaseColumns(API 1) and BaseTvColumns(API 21) remains public due to
the backward compatability. Plus, inheritence between BaseProgramColumns
and BasePreviewColumns is also removed to follow patterns in other
Contracts.

Test: cts-tradefed run cts -m CtsTvTestCases -t android.media.tv.cts.TvContractTest
Bug: 36395855
Change-Id: Ie73a2e48217676be53f373f8524afd04f7d8fc37
2017-04-04 10:11:45 -07:00
Jean-Michel Trivi
847cef792a Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev am: adc1605530
am: ce7558003b

Change-Id: If92d1355d0b3ee28ee7f3c51fdf8a736c6ce5f98
2017-04-04 15:49:01 +00:00
TreeHugger Robot
adc1605530 Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev 2017-04-04 15:32:25 +00:00
Narayan Kamath
1163568d7c Merge "Properly guard access to CloseGuard in finalizers." 2017-04-04 12:27:02 +00:00
Jean-Michel Trivi
9eab2eaed8 Merge "Audio focus: API for external audio focus policy" into oc-dev am: 4d52ae9707
am: 23e6cea555

Change-Id: Ica9bca5dde505616999eafded3f0861ce0fcffff
2017-04-04 02:52:15 +00:00
TreeHugger Robot
4d52ae9707 Merge "Audio focus: API for external audio focus policy" into oc-dev 2017-04-04 02:40:02 +00:00
Dongwon Kang
10b9632eac Merge "TIF: use integer for constants instead of string" into oc-dev am: b43a5305bd
am: 2227541021

Change-Id: Ib3661309d1969e5b6407c739e4112d9c2a83e00d
2017-04-04 01:26:33 +00:00
TreeHugger Robot
b43a5305bd Merge "TIF: use integer for constants instead of string" into oc-dev 2017-04-04 01:10:44 +00:00
Hangyu Kuang
60024fca06 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev am: 99442d3427
am: 958a284426

Change-Id: I0df6e5b0ba764b5b1f80e3e96b9ab7ecaf756a61
2017-04-04 00:50:07 +00:00
TreeHugger Robot
99442d3427 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev 2017-04-04 00:33:46 +00:00
Dongwon Kang
c83a1628a2 Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev am: 64731b1d41
am: 2e7a92f1a5

Change-Id: I1a7ab67424478c92ab879a39b3b54aeb31ee9f95
2017-04-03 22:07:47 +00:00
Jean-Michel Trivi
126cf03f7c Audio focus: API for external audio focus policy
System API for an external audio focus policy. Extends
 the system focus listener with interception of
 focus requests and abandons. Adds method for the focus
 policy to dispatch focus grants and losses.

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t 'com.google.android.gts.audio.AudioHostTest#testFocusPolicy'
Bug: 30258418
Change-Id: If408569a2dce07a774e0e2f1be9f1af8e426d2d3
2017-04-03 14:44:47 -07:00
Hangyu Kuang
9ef7fe43c9 media: unhide mediarecorder's setVideoEncodingProfileLevel api.
Test: GoogleCmaera app.
bug: 35151543
Change-Id: I37dee948298a14d338bca670af0bc01450c83529
2017-04-03 12:56:39 -07:00
Dongwon Kang
f9bbac1daf TIF: use integer for constants instead of string
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 36395855
Change-Id: I9f0d62acb73883f543219a1ee4ed961140221a11
2017-04-03 12:51:53 -07:00
Dongwon Kang
70fb40c17a TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 35856179
Change-Id: I284cb1b764203c646e3edb3f105d90d59a7688d1
2017-04-03 12:51:52 -07:00
Jean-Michel Trivi
e0b5bf50d6 AudioAttributes: remove static getVolumeControlStream method
Remove (unreleased) getVolumeControlStream static method.

Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioAttributesTest
Bug: 36724262
Change-Id: Ieab0f61eb0ce032d9dd6716bf78f7cfc59b6eb51
2017-04-03 12:02:19 -07:00
Narayan Kamath
492e9e851c Properly guard access to CloseGuard in finalizers.
CloseGuard instances are allocated in constructors and usually
assigned to final fields. This implies they're non-null in finalizers
except in the case where the constructor throws. We add a null check
to make sure we can continue cleaning up other state in the finalizer
(if applicable).

Also, this change decouples closeguard warnings in constructors
from other state based logic. This because the logic there is usually
duplicated with the call to close().

NOTE: This change is not a "complete" fix. Many of these finalizers
are broken in the case where <init> throws. The only objective of
this change is to make such errors more obvious.

Note that some of these classes don't have CTS tests.

Test: make, CtsMediaTestCases.
Bug: 35609098

Change-Id: I24d9e0215f80e44914dba8ab99b6312fd6ed1fc0
2017-04-03 18:12:04 +01:00
Chulwoo Lee
d529dfc8ac Merge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev am: 0a198d1034
am: b1cd4c5478

Change-Id: I976ef410f41cce40fc12ea6d2d76c2860ce112d8
2017-04-01 03:08:35 +00:00
TreeHugger Robot
0a198d1034 Merge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev 2017-04-01 03:01:04 +00:00
Dongwon Kang
3b7ab2a4df Merge "TIF: Remove redundant modifiers in TvContract" into oc-dev am: 32e45042c9
am: bf9f80219c

Change-Id: I36f91c211b1fe69ff887e207b15b165ae9e563a1
2017-03-30 23:35:23 +00:00
TreeHugger Robot
32e45042c9 Merge "TIF: Remove redundant modifiers in TvContract" into oc-dev 2017-03-30 23:20:55 +00:00