Conrad Chen
61c45cbd85
Merge "TIF: fix javadoc of recorded programs" into oc-dev am: a16d465a18
...
am: 790c4fbd0e
2017-04-26 22:09:27 +00:00
Conrad Chen
a16d465a18
Merge "TIF: fix javadoc of recorded programs" into oc-dev
2017-04-26 21:48:01 +00:00
Dongwon Kang
1a2cd67546
Merge "TIF: fix documentation in TvContract" into oc-dev am: e1a795379d
...
am: edf3936f17
2017-04-26 17:34:17 +00:00
Jean-Michel Trivi
fb229687d9
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev am: c4a169cfb4
...
am: ecbe5f0305
2017-04-26 17:32:23 +00:00
Dongwon Kang
e1a795379d
Merge "TIF: fix documentation in TvContract" into oc-dev
2017-04-26 16:22:13 +00:00
Jean-Michel Trivi
c4a169cfb4
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
2017-04-26 15:27:04 +00:00
Dongwon Kang
ff5096e815
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev am: a35e4e5584
...
am: de938e3695
2017-04-26 01:22:38 +00:00
Jeff Sharkey
e00742f4c5
Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
...
am: db73950734
2017-04-26 00:41:04 +00:00
TreeHugger Robot
a35e4e5584
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev
2017-04-26 00:27:57 +00:00
Jean-Michel Trivi
461922fcfc
Audio focus enforcement: duck automatically apps for SDK O+
...
Enforce automatic ducking only for apps written for an SDK target
level above 25 (N-MR1)
Test: play notification while Podcast Addict is playing, verify it pauses instead of being ducked
Bug: 37506138
Change-Id: Id7e01a92a51308bd7a3f24abc417d2434b532c12
2017-04-25 15:23:17 -07:00
Jeff Sharkey
a00c7c0a99
Merge "Fix some issues found by new doclava linter." into oc-dev
2017-04-25 22:11:01 +00:00
Jeff Sharkey
0f3f60b576
Fix some issues found by new doclava linter.
...
Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
2017-04-25 13:12:45 -06:00
Jean-Michel Trivi
2efc369373
Merge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce
...
am: d4561d4a90
2017-04-25 15:51:51 +00:00
Jean-Michel Trivi
44515357ce
Merge "VolumeShaper: API change for duration" into oc-dev
2017-04-25 15:36:38 +00:00
Dongwon Kang
0dfc8e46ff
TIF: fix documentation in TvContract
...
This fixes wrong documentation on the following fields:
PreviewPrograms|WatchNextPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS
PreviewPrograms|WatchNextPrograms.COLUMN_DURATION_MILLIS
Test: build
Bug: 37624075
Change-Id: Iad98ebeac713a034bbca9a31113c0da9bbd39832
2017-04-24 16:17:52 -07:00
Jean-Michel Trivi
4c86efa1e3
VolumeShaper: API change for duration
...
Time in milliseconds is a long.
Update API to not specify the unit in the setter/getter for
the VolumeShaper duration.
Test: cts-tradefed run cts CtsMediaTestCases -t android.media.cts.VolumeShaperTest
Change-Id: If5f95cc43418d831105cbef2c43b6e9cfcf9082b
2017-04-24 22:58:22 +00:00
Conrad Chen
cc91454f8c
TIF: fix javadoc of recorded programs
...
Removes descriptions about required field of recorded programs' channel
ID.
Test: javadoc fix
Bug: 37625301
Change-Id: I0ae5eb6e5419883455044676b23e013392cc3e61
2017-04-24 12:08:56 -07:00
Wei Jia
f316c99123
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev am: 62a3aa745a
...
am: f38aa207b2
2017-04-21 21:25:04 +00:00
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
