TreeHugger Robot
62a3aa745a
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
2017-04-21 21:10:51 +00:00
Wei Jia
bebeaf9ae3
MediaPlayer: fix new API seekTo to address API review.
...
Test: compiles
Bug: 36790516
Bug: 37514763
Change-Id: I91307d10e6c9bc65779651c056053b3a025b0d50
2017-04-21 11:05:13 -07:00
Dongwon Kang
a98fd56bff
TIF: remove c-tor for WatchNextProgram
...
Test: build
Bug: 37514616
Change-Id: I61ea5182cbfec6bbd260c2b3b08b5f456e0558d4
2017-04-21 10:14:04 -07:00
Hassan Shojania
4582a8e942
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev am: 652d006d6b
...
am: 4ad936a593
2017-04-21 06:08:37 +00:00
Hassan Shojania
652d006d6b
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev
2017-04-21 02:58:25 +00:00
Hangyu Kuang
21689ed8e3
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev am: 0e6cce9de1
...
am: 3d17f50718
2017-04-21 02:29:11 +00:00
TreeHugger Robot
0e6cce9de1
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev
2017-04-21 02:06:18 +00:00
Hangyu Kuang
c481c50a42
media: Change setNextOutputFile to address API review comments.
...
Bug: 37514763
Test: CTS test
Change-Id: If0fb59f26ecf3882600ca7a8b26b6c248615bbd0
2017-04-20 13:53:48 -07:00
Mikhail Naganov
4f4e259dc1
MIDI: Mark IMidiDeviceServer.closeDevice as oneway
...
This method is called from MidiService which is part of the system
server and thus should avoid blocking calls.
Bug: 37535382
Change-Id: Id44e159cf997fafbb0f0f69d31b38c10844808b5
Test: make
2017-04-20 19:58:42 +00:00
Conrad Chen
0ad8010984
Merge "Fix overlay view not updated during scaling TvView" into oc-dev am: 047adbefe2
...
am: 05ab51b4f0
2017-04-20 18:46:09 +00:00
Conrad Chen
047adbefe2
Merge "Fix overlay view not updated during scaling TvView" into oc-dev
2017-04-20 18:08:12 +00:00
Jean-Michel Trivi
5c77eaffd0
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev am: ac7f215124
...
am: 17d5e9a028
2017-04-20 17:41:51 +00:00
Jean-Michel Trivi
ac7f215124
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev
2017-04-20 15:45:11 +00:00
Hassan Shojania
5167ede2af
MediaPlayer/ModularDrm API review: Document/runtime exception update
...
Bug: 36790220
Bug: 37514763
Test: GTS tests
Change-Id: I264f6cf66dd09e94720edcf22110240be61e9702
2017-04-19 19:35:02 -07:00
Conrad Chen
3496c38e50
Fix overlay view not updated during scaling TvView
...
Includes scaleX and scaleY into calculation of view frame.
Test: build and verified by manually testing
Bug: 37302836
Change-Id: I72458cf1d5b356f0fc93200a712ff6fb4ef0c2f9
2017-04-19 14:37:13 -07:00
Jean-Michel Trivi
fa97222e87
Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""
...
This reverts commit e4a9911b68
2017-04-19 18:37:27 +00:00
Hassan Shojania
0ac8b6684b
Merge "MediaPlayer/ModularDrm API review" into oc-dev am: 62a5d29f2d
...
am: 8f0dce63ce
2017-04-18 18:56:40 +00:00
Hassan Shojania
62a5d29f2d
Merge "MediaPlayer/ModularDrm API review" into oc-dev
2017-04-18 18:41:29 +00:00
Sungsoo Lim
8c1ac15318
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev am: ab16ea9094
...
am: 0432fd9aa5
2017-04-18 02:29:39 +00:00
Sungsoo Lim
4729d38876
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev am: a44d7cd25b
...
am: a8647cb547
2017-04-18 02:23:44 +00:00
Sungsoo Lim
78403edb8c
Merge "MediaBrowser: Revert Search API" into oc-dev am: 51d91bff17
...
am: 09c3bdd1db
2017-04-18 02:19:56 +00:00
jiabin
025d49098c
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev am: 4fba6e62a1
...
am: 02b100c62b
2017-04-18 02:04:51 +00:00
Sungsoo Lim
ab16ea9094
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev
2017-04-18 00:32:58 +00:00
Sungsoo Lim
a44d7cd25b
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
2017-04-18 00:31:35 +00:00
Sungsoo Lim
51d91bff17
Merge "MediaBrowser: Revert Search API" into oc-dev
2017-04-18 00:26:26 +00:00
TreeHugger Robot
4fba6e62a1
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
2017-04-17 23:25:26 +00:00
Hangyu Kuang
f3276baa03
Merge "media: Address API review comments" into oc-dev am: ab312729ce
...
am: bde6da6f18
2017-04-17 17:20:20 +00:00
Hangyu Kuang
ab312729ce
Merge "media: Address API review comments" into oc-dev
2017-04-17 17:04:28 +00:00
Hassan Shojania
f9d3bb7735
MediaPlayer/ModularDrm API review
...
Bug: 36790516
Bug: 36790220
Bug: 36788024
Bug: 36790117
Test: GTS tests
Change-Id: Id813459ae6b94e25a31736a5dec6a4c0744c4696
2017-04-15 14:26:44 -07:00
Ray Essick
697580cc56
Merge "Rework getMetrics() api per API council" into oc-dev am: abbea1df6b
...
am: b3934d9043
2017-04-15 19:08:10 +00:00
Ray Essick
10353e3601
Rework getMetrics() api per API council
...
Reworking the media metrics getMetrics() calls (currently in MediaCodec,
MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction
from the API Council.
Drop the MediaMetricsSet that we had in the first round; go back
to a PersistableBundle as the return type. Moves the key definitions
from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants
Bug: 37083862
Test: ran the corresponding CTS tests
Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
2017-04-14 17:24:42 -07:00
Hangyu Kuang
5ba5e9182c
media: Address API review comments
...
Change setNextOutputFile to accept File instead of String. Also add new version
of setOutputFile to accept File.
Bug: 36791064
Test: CTS test.
Change-Id: I1a3d574e7cf36acbf181407131bc9dbf114d30de
2017-04-14 13:41:01 -07:00
Dongwon Kang
625df43c5c
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am: 0cdc7c8874
...
am: 294176e988
2017-04-14 18:27:05 +00:00
Dongwon Kang
0cdc7c8874
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
2017-04-14 17:05:31 +00:00
Jeff Tinker
835a765a3a
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd51
...
am: a29ecc1a1c
2017-04-14 16:46:07 +00:00
jiabin
cc6759b193
Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am: 2ec7decaa5
...
am: 4f499a0a17
2017-04-14 16:36:01 +00:00
Dongwon Kang
08b24d1507
Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d
...
am: 3d9ecc264d
2017-04-14 16:12:49 +00:00
TreeHugger Robot
92fc8bdd51
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev
2017-04-14 00:09:42 +00:00
TreeHugger Robot
2ec7decaa5
Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev
2017-04-13 23:39:13 +00:00
Dongwon Kang
2566af67e5
TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms
...
Test: build
Bug: 37288064
Change-Id: I4750547a2550ef058c5fbdeca344fe5a94fc3fc9
2017-04-13 14:58:45 -07: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
jiabin
0b8df1dedb
Add TvProvider methods to block or unblock package, get blocked packages
...
Test: gts-tradefed run gts -m GtsTvTestCases
Bug: 36697660
Change-Id: I6464542820a4b56e3145eecdf28ebd422a567040
2017-04-13 11:35:28 -07:00
jiabin
b899425773
TIF: Add preview parameter to filter only preview or non-preview channels.
...
Test: runtest --path packages/providers/TvProvider/tests
Bug: 36699790
Change-Id: Idc65ed0e2c21027fbe3033a9abb139c3f7320f54
2017-04-13 10:27:55 -07:00
Chong Zhang
5ad4b40999
Merge changes from topic 'api-review' into oc-dev am: fd89a95f35
...
am: 847beba350
2017-04-13 06:45:04 +00:00
Chong Zhang
35af7a8948
MediaCas: address comments for API reviews am: addc39ec27
...
am: e0c465fefa
2017-04-13 06:43:36 +00:00
Chong Zhang
e0c465fefa
MediaCas: address comments for API reviews
...
am: addc39ec27
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
Sungsoo
3e5a34ea8e
Revert "MediaSession: Add methods for setting shuffle and repeat modes"
...
This reverts commit ba11085635
2017-04-13 09:43:23 +09:00
Sungsoo
7066c9e446
Revert "MediaSession: Add methods for queue managements"
...
This reverts commit 99c1f9f453
2017-04-13 09:43:04 +09:00
