Commit Graph

16076 Commits

Author SHA1 Message Date
Andy Hung
bccd475624 Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318 am: 4aea18e7a3 am: 7f251ff523 am: b540ea6bd0
Change-Id: I342b9a01e8f24a73e1f51a0a6ed8f9ee2aa9a627
2020-04-07 22:44:15 +00:00
Andy Hung
7f251ff523 Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318 am: 4aea18e7a3
Change-Id: Ieca3d0050743986cafaf7aa7dcf97c561f17a679
2020-04-07 22:15:04 +00:00
Andrei Litvin
9b9f556af1 Add support for GamePad api in ITvRemoteServiceInput.
Gamepad-specific API is a separtate input path from standard "remote"
service. Specifically it adds:
  - openGamepad that creates a virtual input device with
  gamepad-specific suport
  - send gamepad keys
  - send gamepad axis updates, which support joysticks, analog triggers
  and HAT axis (as an alternative to DPAD buttons).

Bug: 150764186

Test: atest media/lib/tvremote/tests/src/com/android/media/tv/remoteprovider/TvRemoteProviderTest.java

Test: flashed a ADT-3 device after the changes. Android TV Remote
      on my phone still worked in controlling the UI.

Change-Id: I49612fce5e74c4e00ca60c715c6c72954e73b7a3
2020-04-07 13:15:15 -04:00
Andy Hung
58b896a4ff MediaMetrics: Add typed property keys
This enforces proper type usage.

Test: use test keys, check the dumpsys
Bug: 149850236
Change-Id: Ia24a12b93bb77aa5bd104842ed8c3406f4b4a7e5
2020-04-07 09:55:26 -07:00
Eric Laurent
17ff654d52 Merge "AudioSystem: add annotation on API used by CTS media" into rvc-dev am: 3b13f5ef87 am: 72633a60b9 am: 12d431ce9e am: fb7332e561
Change-Id: Idea18386300a80c9a4398001b50d2e926dba4507
2020-04-07 02:05:21 +00:00
Eric Laurent
12d431ce9e Merge "AudioSystem: add annotation on API used by CTS media" into rvc-dev am: 3b13f5ef87 am: 72633a60b9
Change-Id: Ia312f9eb85f6dc9c8277267314fe2605614f5c9f
2020-04-07 01:30:11 +00:00
TreeHugger Robot
ba24993542 Merge "Tuner API: set Frontend and Lnb info to TRM" into rvc-dev am: 48a7be797d am: 0dddb51a9e am: c10e684835 am: 0964379b42
Change-Id: I77cd1dc22f976725dc54e5ef976c1c004365bee3
2020-04-06 22:13:41 +00:00
François Gaffie
d83e946d53 AudioSystem: add annotation on API used by CTS media
Add @TestApi for the class so some methods and
constants can be visible to test API.
  Also @hide for all other members of the class
that are not @TestApi, as they are exposed to the
test API visibility.

Bug: 136121584
Test: run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupChangeHandlerTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testPermissionsForVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateProductStrategies
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateVolumeGroups
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributesWithInvalidAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

Change-Id: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
2020-04-06 15:04:22 -07:00
TreeHugger Robot
0dddb51a9e Merge "Tuner API: set Frontend and Lnb info to TRM" into rvc-dev am: 48a7be797d
Change-Id: Ie503e4a3a95d7c60c22f052595de4a414f3ff0f8
2020-04-06 21:24:29 +00:00
shubang
0dc8394e31 Tuner API: set Frontend and Lnb info to TRM
Bug: 139308734
Test: mmm
Change-Id: I17e198e150b453fec6440264c15b10abc2856a11
2020-04-06 18:36:25 +00:00
TreeHugger Robot
afedcbaf9a Merge "Tuner JNI: LnbCallback" into rvc-dev am: d0e4132654 am: 226a97d573 am: b00fa0645f am: a7f0184ba9
Change-Id: Ic26635d0004921b89fb3055c9a3e9610a51e480f
2020-04-06 07:56:31 +00:00
TreeHugger Robot
b00fa0645f Merge "Tuner JNI: LnbCallback" into rvc-dev am: d0e4132654 am: 226a97d573
Change-Id: I0179e412dee5e2517ad3e8e3a1b2b0da67cc380d
2020-04-06 07:27:10 +00:00
TreeHugger Robot
429e96b7da Merge "Tuner JNI: LnbCallback" into rvc-dev am: d0e4132654
Change-Id: I799d27ce88969014bf906841d189eaf933255b2b
2020-04-06 07:14:34 +00:00
TreeHugger Robot
d0e4132654 Merge "Tuner JNI: LnbCallback" into rvc-dev 2020-04-06 07:07:35 +00:00
Treehugger Robot
97fa10dc22 Merge "OWNERS: add philburk@" am: 423f102ab7 am: 2c293201b3 am: 81f2dbc72b am: 371daed5db am: 063a4442be
Change-Id: Ia6bc014b9bd0fb709b37a77f10d05779c30e9ba9
2020-04-04 12:58:30 +00:00
Treehugger Robot
81f2dbc72b Merge "OWNERS: add philburk@" am: 423f102ab7 am: 2c293201b3
Change-Id: I0a887de8959b27edc2f2784e885814515d469987
2020-04-04 12:08:23 +00:00
Treehugger Robot
2c293201b3 Merge "OWNERS: add philburk@" am: 423f102ab7
Change-Id: Id3018817af322f235cf1762b114f1ca863e30793
2020-04-04 11:45:12 +00:00
TreeHugger Robot
70498a163d Merge "BluetoothMidi test: test encoder and decoder" into rvc-dev am: 7bfa49bf27
Change-Id: I8410e6c2b020b4cd88d3152bf13afa31f2ced247
2020-04-04 03:49:36 +00:00
TreeHugger Robot
7bfa49bf27 Merge "BluetoothMidi test: test encoder and decoder" into rvc-dev 2020-04-04 03:46:15 +00:00
Phil Burk
6c0aff044d BluetoothMidi test: test encoder and decoder
Also test MidiFramer
Add end-to-end test through encoder and decoder.
Add test for reserved bit in header.

Bug: 35669198
Bug: 140638458
Bug: 149927520
Test: atest BluetoothMidiTests
Change-Id: I767deab6847d2b45e01bed29f5eed3df0f0e46c0
Merged-In: I767deab6847d2b45e01bed29f5eed3df0f0e46c0
2020-04-04 00:43:20 +00:00
Phil Burk
91106ec49c Merge "BluetoothMidi: ignore reserved bit in header" into rvc-dev am: 576e2cc6fe am: f59d0a3a1a am: 7a8e601486 am: 4c15c25de3
Change-Id: I276c7398680c10eebb8049ec3185f14609655308
2020-04-03 23:18:28 +00:00
Phil Burk
f59d0a3a1a Merge "BluetoothMidi: ignore reserved bit in header" into rvc-dev am: 576e2cc6fe
Change-Id: Iad6d11bd5713eeeddcc3caf871176134198f0c6b
2020-04-03 22:36:41 +00:00
Phil Burk
04774355d7 Merge "BluetoothMidi test: test encoder and decoder" 2020-04-03 22:17:01 +00:00
Phil Burk
576e2cc6fe Merge "BluetoothMidi: ignore reserved bit in header" into rvc-dev 2020-04-03 22:15:13 +00:00
Henry Fang
72e3faf224 Merge "Add test api for CTS to test resource lost event" into rvc-dev am: bc93009274 am: 6cb58060ef am: bff89de6c7 am: 4efc95d417
Change-Id: Ic706dc4823b0f11205c107af8b12d990c4ed93ff
2020-04-03 21:11:33 +00:00
Henry Fang
bff89de6c7 Merge "Add test api for CTS to test resource lost event" into rvc-dev am: bc93009274 am: 6cb58060ef
Change-Id: Ib449b1917d6f07fa4b67e9e2f385e4bf09e2bacc
2020-04-03 20:40:27 +00:00
Henry Fang
d7b5f4399a Merge "Add test api for CTS to test resource lost event" into rvc-dev am: bc93009274
Change-Id: I4786e76cd24c014f7e1c3d00b9f5cba0a4d0715d
2020-04-03 20:29:05 +00:00
TreeHugger Robot
b1b2fcabf1 Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev am: 8885e4f115 am: 86dfd4b316 am: 0e6d4cf00f am: 9b3bf34b5b
Change-Id: Ie349cdbc66fa01a0e36a33a8193344ccdcd0a9cb
2020-04-03 20:22:11 +00:00
Henry Fang
bc93009274 Merge "Add test api for CTS to test resource lost event" into rvc-dev 2020-04-03 20:09:19 +00:00
TreeHugger Robot
0e6d4cf00f Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev am: 8885e4f115 am: 86dfd4b316
Change-Id: I478c0dd98b4f24969ef637ea11339bc3d90dbca2
2020-04-03 19:42:59 +00:00
TreeHugger Robot
005e8990a9 Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev am: 8885e4f115
Change-Id: I7e24db3e8ff19e90cdcd890246ba8c0d1c0906aa
2020-04-03 19:20:06 +00:00
Phil Burk
240615270a OWNERS: add philburk@
So I can work on MIDI services.

Test: review the file
Change-Id: I0b4b82fd31951a0510a87a1ac4fb74869a134676
2020-04-03 12:09:46 -07:00
TreeHugger Robot
8885e4f115 Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev 2020-04-03 18:59:27 +00:00
shubang
d295be0576 Tuner JNI: LnbCallback
and demux.setFrontendDataSource

Bug: 139308734
Test: mmm
Change-Id: I99e0c8536884815e8b9b0f778a378bb69a5f9540
2020-04-03 17:57:24 +00:00
Henry Fang
1eef1d2f26 Add test api for CTS to test resource lost event
bug: 152343262
Test: Manual
Change-Id: I5660cea3e57771c8a09f57ed88723064bb592c30
2020-04-03 17:39:13 +00:00
TreeHugger Robot
28c815ef1c Merge "AudioManager: set/get audio device volume behavior" into rvc-dev am: e9ffff37d4 am: 902a2df617 am: 3b2a6acde4 am: 84280d2bae
Change-Id: Ic4ce8f8850af7d2329f15a5fd0c7100d2290ceae
2020-04-03 17:02:04 +00:00
TreeHugger Robot
902a2df617 Merge "AudioManager: set/get audio device volume behavior" into rvc-dev am: e9ffff37d4
Change-Id: I7ae901012d78d8088f4e75d27285102632833b39
2020-04-03 16:34:01 +00:00
TreeHugger Robot
e9ffff37d4 Merge "AudioManager: set/get audio device volume behavior" into rvc-dev 2020-04-03 16:27:14 +00:00
Phil Burk
0a59ca240d BluetoothMidi test: test encoder and decoder
Also test MidiFramer
Add end-to-end test through encoder and decoder.
Add test for reserved bit in header.

Bug: 35669198
Bug: 140638458
Bug: 149927520
Test: atest BluetoothMidiTests
Change-Id: I767deab6847d2b45e01bed29f5eed3df0f0e46c0
2020-04-02 18:41:02 -07:00
TreeHugger Robot
1df3d5e434 Merge "Tuner JNI: getFrontendInfo" into rvc-dev am: 69bbfca9c2 am: 84cf111a94 am: 0162cfbe94 am: 28ac5fb1ff
Change-Id: Ic7e8eec0c197fcf06261fa71b7e77df75fbd7bf6
2020-04-02 22:42:54 +00:00
TreeHugger Robot
0162cfbe94 Merge "Tuner JNI: getFrontendInfo" into rvc-dev am: 69bbfca9c2 am: 84cf111a94
Change-Id: Iba3ce849650e59a7f084e0d002f6d2be19bd8da9
2020-04-02 21:58:11 +00:00
TreeHugger Robot
5a7bfe8fbc Merge "Tuner JNI: getFrontendInfo" into rvc-dev am: 69bbfca9c2
Change-Id: I3c85adbcd29b513bc7bc951f8dc41835df5209fe
2020-04-02 21:37:28 +00:00
TreeHugger Robot
69bbfca9c2 Merge "Tuner JNI: getFrontendInfo" into rvc-dev 2020-04-02 21:24:00 +00:00
Hyundo Moon
bc14ee581e Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev am: dbbb846b8c am: 9f35679ff8 am: 0c2d6be7f0 am: 3d757a7a8e
Change-Id: I43610061fbb057d08cadd85542a61a4fefe66adf
2020-04-02 18:59:21 +00:00
Kyunglyul Hyun
4a36651981 Merge "Call MediaRouter2Manager#onTransferred" into rvc-dev am: bd67f0ad34 am: a28daa0022 am: 1699b0c560 am: a412e4e937
Change-Id: I96e16646ee23121f154b84b73511dfcfda051e04
2020-04-02 18:49:26 +00:00
Jean-Michel Trivi
005c6015db AudioManager: set/get audio device volume behavior
Add support for setting and querying the volume behavior of
an audio device.
When setting the behavior, udpate the current volume on that
device.

Bug: 152755063
Test: atest AudioServiceTest
Change-Id: I024317e50baf159e031b57c805d7b389ed470e62
2020-04-02 07:53:29 -07:00
Hyundo Moon
0c2d6be7f0 Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev am: dbbb846b8c am: 9f35679ff8
Change-Id: Ia43fd9f5cf3db19dd1384dd359f00b0907744b0a
2020-04-02 08:25:53 +00:00
Hyundo Moon
f3a1da84db Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev am: dbbb846b8c
Change-Id: I83870e2f4d87cce1dd6e34922dd6921955f7cfa3
2020-04-02 07:42:13 +00:00
Hyundo Moon
dbbb846b8c Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev 2020-04-02 07:15:18 +00:00
Kyunglyul Hyun
1699b0c560 Merge "Call MediaRouter2Manager#onTransferred" into rvc-dev am: bd67f0ad34 am: a28daa0022
Change-Id: Idb568b2b1345a392fe00b2c7001ff189745ef4b6
2020-04-02 05:12:03 +00:00