Sungsoo
10993ea5a3
MediaBrowser: Revert Search API
...
Bug: 36844917, Bug: 36524926, Bug: 36525667
Test: Pass MediaBrowserTest and MediaBrowserServiceTest
Change-Id: I07db20cc5ea30e8b68faa1dd6fc955a2a2153259
2017-04-13 09:38:59 +09:00
Jeff Tinker
112b98b578
Deprecate MediaDrm's EVENT_KEY_EXPIRED method
...
It has been replaced by onKeyStatusChange
Test: make offline-sdk-docs
bug: 21661111
Change-Id: I18e6604e9d3db7fb05209ad053b07546e7dd2bbd
2017-04-12 17:26:57 -07:00
Dongwon Kang
02f7b9a1e3
Merge "TIF: add review rating columns to programs" into oc-dev am: bf02434e79
...
am: 648e007501
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
