11871 Commits

Author SHA1 Message Date
Dongwon Kang
08b24d1507 Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
2017-04-14 16:12:49 +00:00
TreeHugger Robot
b2eb818a7d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 2017-04-13 21:23:48 +00:00
Chong Zhang
5ad4b40999 Merge changes from topic 'api-review' into oc-dev am: fd89a95f35
am: 847beba350

Change-Id: I7abb72fe43b565e3fb4b31418192418b686100f9
2017-04-13 06:45:04 +00:00
Chong Zhang
35af7a8948 MediaCas: address comments for API reviews am: addc39ec27
am: e0c465fefa

Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
2017-04-13 06:43:36 +00:00
Chong Zhang
e0c465fefa MediaCas: address comments for API reviews
am: addc39ec27

Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
2017-04-13 06:32:28 +00:00
TreeHugger Robot
fd89a95f35 Merge changes from topic 'api-review' into oc-dev
* changes:
  MediaCas: combine openSession methods
  MediaCas: address comments for API reviews
2017-04-13 06:23:51 +00:00
Dongwon Kang
2e7f5ce709 TIF: add helper methods for making a channel browsable.
Test: build and manually tested with a local app.
Bug: 36395259, Bug: 36097352
Change-Id: I512ed6f4da21af01445fdbcd2f200a681c5dde19
2017-04-12 20:55:22 -07:00
Dongwon Kang
02f7b9a1e3 Merge "TIF: add review rating columns to programs" into oc-dev am: bf02434e79
am: 648e007501

Change-Id: Iab298377ad614291e6c194d056a3f070be470ce8
2017-04-12 17:40:44 +00:00
Dongwon Kang
bf02434e79 Merge "TIF: add review rating columns to programs" into oc-dev 2017-04-12 17:12:23 +00:00
Jean-Michel Trivi
ea65fc90f3 Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev am: 170e3e242b
am: 163cdf2fb5

Change-Id: If40faebdb11c9ffe6648b22b43bede52ee6bfeec
2017-04-12 16:00:45 +00:00
Jean-Michel Trivi
170e3e242b Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev 2017-04-12 15:45:58 +00:00
Paul Mclean
72bd4e2c52 Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev am: e0e55f535a
am: ffec10fcd5

Change-Id: Ie914337e190ba49d7ce4f0b3a3e485a14a4dd3d2
2017-04-12 15:37:54 +00:00
Paul Mclean
e0e55f535a Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev 2017-04-12 15:16:22 +00:00
Jean-Michel Trivi
0dfbd1569d VolumeShaper: update API, use "Millis" instead of "Ms"
Test: make
Bug: 36785428
Change-Id: Ib77ff448bb8454453b1bd39f1491b0189b4ff15b
2017-04-11 19:05:26 -07:00
Conrad Chen
46e47cbecc Merge "TIF: add TvInputManager methods to notify apps" into oc-dev am: 307bec8572
am: 081db81a99

Change-Id: I267fe4c5723ffa66c0555bba862b1618aebae5fd
2017-04-12 01:30:33 +00:00
Conrad Chen
307bec8572 Merge "TIF: add TvInputManager methods to notify apps" into oc-dev 2017-04-12 00:25:37 +00:00
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
Emilian Peev
d4dc369ca3 Merge "Camera: Initial support for vendor tag caches" into oc-dev am: a441da153e
am: 222cd1a634

Change-Id: I96fe807766dd59a68c237870724267410584b59c
2017-04-06 14:14:39 +00:00
TreeHugger Robot
a441da153e Merge "Camera: Initial support for vendor tag caches" into oc-dev 2017-04-06 14:02:11 +00: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
TreeHugger Robot
ff8bf0cc95 Merge "Update MediaDrm documentation for provideKeyResponse" into oc-dev 2017-04-06 06:06:51 +00:00
Ray Essick
26214bced0 Merge "Move MediaMetrics into its own library" into oc-dev am: 630671a603
am: fb7db64f2a

Change-Id: I614c037adf329509234535c1fa3779ed35a9b47d
2017-04-06 03:20:34 +00:00
Ray Essick
ed5b028693 Move MediaMetrics into its own library
Changes for the new HAL structure have brought about a build time
circular dependency between libmedia and libmediadrm. This set of
changes the media metrics code into its own library and arranges
for the relevant consumers of the media metrics code to link
to this new library (where they had previously picked it up by
including libmedia).

Bug: 36990807
Test: build, boot.
2017-04-05 14:01:00 -07:00
Emilian Peev
de62d84eb9 Camera: Initial support for vendor tag caches
Vendor tag cache will be used alternatively to the regular
Vendor tag descriptor. The caches can support multiple vendor
tag providers at the same time. The native metadata along with
the requests/results/characteristics will store vendor specific
information that will be used to indentify the respective
descriptor.

Bug: 34275821
Test: Complete Camera/Camera2 CTS tests
Change-Id: I50b7cf9aa5575944fde7673a1728869690b2ce0d
2017-04-05 20:50:10 +01: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
Mathias Agopian
fb515c1fdd Merge "Remove useless GraphicBuffer() constructor" into oc-dev am: 810e018e24
am: dd1da2dcc1

Change-Id: I97c824bee05e693e488e2f63f02fe6b1a1acaf31
2017-04-05 00:59:34 +00:00
Mathias Agopian
810e018e24 Merge "Remove useless GraphicBuffer() constructor" into oc-dev 2017-04-05 00:42:58 +00: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