Commit Graph

5830 Commits

Author SHA1 Message Date
Jean-Michel Trivi
c903a8894a Merge "Message about audio stream deprecation as warning" into oc-dev am: dd8a71f4a9
am: 86af1cd18f

Change-Id: I8c3627d5756661115c66228187c2b0685a7145f3
2017-05-02 19:42:15 +00:00
TreeHugger Robot
ae6cf17a9a Merge "Make IMidiDeviceServer.setDeviceInfo method oneway" 2017-05-02 17:41:54 +00:00
Jean-Michel Trivi
c4c13b44b8 Message about audio stream deprecation as warning
The message indicating the use of stream types for operations
  other than volume control is deprecated shouldn't be an
  error but a warning

Test: use apps that request audio focus with a stream type, check log
Bug: 37887058
Change-Id: Iaafae8aa599984688dae448e868de81317add4d3
2017-05-02 10:01:08 -07:00
Chulwoo Lee
3457567178 Merge "Allow null setup activity for TV input" into oc-dev am: 90074d1ec8
am: 6af43e5d6f

Change-Id: I0b791a12cdee5dc5ce4bdc1c27eecd8b0166fc15
2017-05-02 07:08:41 +00:00
TreeHugger Robot
90074d1ec8 Merge "Allow null setup activity for TV input" into oc-dev 2017-05-02 06:56:52 +00:00
Conrad Chen
2a85907926 Merge "TIF: change documentation wording for onSetSurface()" into oc-dev am: 12c6a04db0
am: 526b3914ba

Change-Id: I00cdec5ab86ed4d811931e552188dc809fdae351
2017-05-02 03:40:54 +00:00
TreeHugger Robot
12c6a04db0 Merge "TIF: change documentation wording for onSetSurface()" into oc-dev 2017-05-02 03:26:32 +00:00
Mikhail Naganov
b414a2ccf1 Make IMidiDeviceServer.setDeviceInfo method oneway
This method is called from MidiService in system server, must be
oneway.

Remove the call to IMidiDeviceServer.getDeviceInfo from
MidiService. It seems to be redundant. The reason is that
MidiDeviceInfo is only created by MidiService (to maintain
unique IDs), and after creation, it is pushed both to a remote
MidiDeviceServer, and to a local MidiService.Device class
simultaneously inside addDeviceLocked method. Thus, if
MidiService.Device.mDeviceInfo is still null, there is no chance
that remote MidiDeviceServer can hold a non-null
MidiDeviceInfo. So the call to IMidiDeviceServer.getDeviceInfo
will also return null, and thus can be avoided.

Note that only for BT MIDI devices can MidiService.Device receive
MidiDeviceInfo later in the lifecycle. All other types of devices
receive MidiDeviceInfo upon construction.

Bug: 37535382
Test: Used BT MIDI keyboard with MidiSynthDemo app
Change-Id: I5378207922187866f3c43e01f1ed30f042720167
2017-05-01 16:46:50 -07:00
Chulwoo Lee
75ffc5f309 Allow null setup activity for TV input
Test: cts-tradefed run cts -m CtsTvTestCases -t android.media.tv.cts.TvInputInfoTest
Bug: 37863603
Change-Id: I62f9927f94534c0564a3c52f8c7b266a347399e1
2017-05-01 14:10:25 -07:00
Conrad Chen
a9b6289faa TIF: change documentation wording for onSetSurface()
Test: documentaion fix
Bug: 31494507
Change-Id: Ib25d45fb3c7e973aa09a5f91ced11abefea4c5ba
2017-05-01 13:18:51 -07:00
Jean-Michel Trivi
21785d6385 Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev am: a08ba3ef31
am: 43c34ae003

Change-Id: If55c6cc4e9130359207a33cc006820313df8db96
2017-05-01 20:09:41 +00:00
Jean-Michel Trivi
36728ce14f Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest
When translating a focus request from the N- API to AudioFocusRequest,
  do not do null checks for listener or handler, those are only
  for the AudioFocusRequest.Builder.

Test: use app built for N- and request focus, no crash
Bug 37855238

Change-Id: I675b3144e913ab674fe27f9f65ee7a7bea24a72c
2017-05-01 12:33:40 -07:00
jiabin
cb6990b3ad Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev am: f3a5f66139
am: 653263bba4

Change-Id: I62f3775591e65004be4db03cffde2c7c73d22869
2017-05-01 18:32:52 +00:00
TreeHugger Robot
f3a5f66139 Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev 2017-05-01 18:20:13 +00:00
Jean-Michel Trivi
926d4a4d49 Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev am: 128f8aa8e3
am: 5642a6559b

Change-Id: I37a1a943406ec2384bc403f70b790a56f0fd00d0
2017-05-01 06:49:06 +00:00
Jean-Michel Trivi
97de334ff1 AudioFocusRequest: more docs, listener without handler
Focus listener: follow platform pattern for setter of listener
  and handler (set(listener) and set(listener, handler) methods).
More docs.

Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioFocusTest
Bug: 30258418

Change-Id: Ib5d1fbc3cf92821b63ffc1b4ad4cf4384bb6ff54
2017-04-30 18:55:03 -07:00
jiabin
2ee60cefcc Add parameter for accessing channels from 3rd-party TV apps.
Test: runtest --path packages/providers/TvProvider/tests
Bug: 37576643
Change-Id: Iff797d4cdc9e0a4115d44c4de732f241a9a9f878
2017-04-28 18:20:10 -07:00
Mathias Agopian
10a9821861 Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev am: b9a2e32130
am: 930442f769

Change-Id: Icc55dde7d080b5f1349a6d49c751f8b5708e88a7
2017-04-28 01:50:11 +00:00
Mathias Agopian
910ab13e66 Plumb gralloc producer/consumer bits correctly
Bug: 33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
2017-04-28 00:13:29 +00:00
Conrad Chen
61c45cbd85 Merge "TIF: fix javadoc of recorded programs" into oc-dev am: a16d465a18
am: 790c4fbd0e

Change-Id: I8b4d61e25c5b0ddd80261def329587fb1cf82b32
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

Change-Id: I0c65d242166c734dc82b3a04c8132683760c4e63
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

Change-Id: Ic534a390b4d2ba25a5b330e1abc65814d4e5c992
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

Change-Id: I1a345ce26aea1946d42c8b79eaf9981ae80bbea6
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

Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d
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

Change-Id: Ieac8c4ff551537534eec88076d92557b90a052d9
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

Change-Id: Ib2c0db36dd3f9958f0ecb714a1b6e73d73e3455d
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

Change-Id: I7bb6b403f9c00b879dba9e3826f61369bbe4f78e
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

Change-Id: If9121b4b63a7b209084293cbe682fded3e3677dc
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

Change-Id: If8f6d6fccb9f5848617e60d0b36e49b987da5b0d
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

Change-Id: I55e393d1abf4b2302f90945783791208e658c632
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