Android Build Merger (Role)
da8e786a16
Merge "bug fix: output colorformat configuration fixed am: 56906949cc
-s ours am: 86995ef4e4
-s ours" into oc-mr1-dev am: 9088105332
-s ours
...
am: 05991fba31
-s ours
Change-Id: I9bc692b30995580f1e3ddf8b27fadbbec25d78f9
2018-01-23 22:53:44 +00:00
Kevin Rocard
7802d1be60
Audio HAL: Allow setters to not be implemented am: 5b21eaa608
-s ours
...
am: ec65974f60
-s ours
Change-Id: I875a6cd8f487d3710462c362ddad534848d0b76c
2018-01-23 22:53:29 +00:00
Android Build Merger (Role)
871f8e4b49
Merge "Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev am: 96b6fcdc4f
-s ours am: 0b304504b5
-s ours" into oc-mr1-dev
2018-01-23 22:53:10 +00:00
Kevin Rocard
810b5b3a85
Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev am: 96b6fcdc4f
-s ours
...
am: 0b304504b5
-s ours
Change-Id: I0b7b4122e7871343aee15b1018267af1bd01043c
2018-01-23 22:53:05 +00:00
Android Build Merger (Role)
821a65113d
Merge "Allow partially dynamic profile in the audio policy config am: e54b381d9d
-s ours am: 615a9a5925
-s ours" into oc-mr1-dev
...
am: d92e09a589
-s ours
Change-Id: I2c03dbd0601f5f3ca6152cd5cb60566657544a8d
2018-01-23 22:53:03 +00:00
Android Build Merger (Role)
8f8e3e44db
Merge "Audio policy config: Device port (type,address) must be unique am: 117188b315
-s ours am: f4f190fd03
-s ours" into oc-mr1-dev
2018-01-23 22:52:46 +00:00
Android Build Merger (Role)
56bb7f7f17
Merge changes from topic "am-37f5fd31-e121-420d-a199-6bb9d1bbf861" into oc-mr1-dev
...
am: 7e51e860e1
Change-Id: Ice17d2669ade40e3e95c43684b4bff1ce8b58b44
2018-01-23 22:52:41 +00:00
Kevin Rocard
c7df1d0c7e
Audio policy config: Device port (type,address) must be unique am: 117188b315
-s ours
...
am: f4f190fd03
-s ours
Change-Id: Ie5a242d384e80f8172c87531f43ca302390e96a6
2018-01-23 22:52:41 +00:00
Android Build Merger (Role)
0f97d8f495
Merge "Audio policy config: allow vendor to extend module name am: eb488fad65
-s ours am: 6834a7bea7
-s ours" into oc-mr1-dev
2018-01-23 22:52:17 +00:00
Kevin Rocard
40013efaa4
Audio policy config: allow vendor to extend module name am: eb488fad65
-s ours
...
am: 6834a7bea7
-s ours
Change-Id: I50efb65c6fae89f73d465a7f7b94cbcf582bea3d
2018-01-23 22:52:12 +00:00
Android Build Merger (Role)
27aed33ab4
Merge "bug fix: restore support for broken flag am: 8d009afdbb
-s ours am: fecadf319e
-s ours" into oc-mr1-dev
...
am: 591caae2ed
-s ours
Change-Id: I80fb7583ad0d69b45ed778a8b9694969fc40d06c
2018-01-23 22:52:10 +00:00
Android Build Merger (Role)
7aa6eeac2b
Merge "Set time delay in the vts test setup am: d4c4a4edfb
-s ours am: 633778a470
-s ours" into oc-mr1-dev
2018-01-23 22:51:54 +00:00
sqian
0d480254c1
Set time delay in the vts test setup am: d4c4a4edfb
-s ours
...
am: 633778a470
-s ours
Change-Id: Ie93d170a53ac61f9c4ea026bf27f590d73d67063
2018-01-23 22:51:49 +00:00
Android Build Merger (Role)
8c9a324efa
Merge "bug fix: handle multiple port settings change events signalled at once am: 0a542276f8
-s ours am: 2d7693b618
-s ours" into oc-mr1-dev
...
am: d2455fe8a8
-s ours
Change-Id: I9d2f1f23b815ff875cc0a51e5853fdc34fe5e05f
2018-01-23 22:51:47 +00:00
Android Build Merger (Role)
a8f125ffe8
Merge "Loosen speed check for first GPS location am: bf4f6db431
-s ours am: f657ce53b4
-s ours" into oc-mr1-dev
2018-01-23 22:51:37 +00:00
Wyatt Riley
0bc6e9ebe2
Loosen speed check for first GPS location am: bf4f6db431
-s ours
...
am: f657ce53b4
-s ours
Change-Id: I2739a1b6157ad541dfec76e453139914b38cfb2f
2018-01-23 22:51:32 +00:00
Android Build Merger (Role)
a4f6ee9898
Merge "Merge "Audio VTS: Look for Audio policy config in all supported folders" into oreo-vts-dev am: 5e74540849
-s ours am: 1991aa694c
-s ours" into oc-mr1-dev
...
am: 75a6990083
-s ours
Change-Id: I7c203fdd34eae1d05a799202f6c4f137b4ca8c82
2018-01-23 22:51:29 +00:00
Android Build Merger (Role)
21ac066637
Merge "Add tests to validate key length for clearkey plugin. am: c312e21b5e
-s ours am: 4a9b599f9a
-s ours" into oc-mr1-dev
2018-01-23 22:51:17 +00:00
Android Build Merger (Role)
ac45ecb1a1
Merge "Merge "bug fix: configure input port buffer size" into oreo-vts-dev am: ccc3c36c88
-s ours am: fcaa3c4dbe
-s ours" into oc-mr1-dev am: 118c2b3ebf
-s ours
...
am: 896b94bafc
-s ours
Change-Id: I9f27c55061709c4eeb4a68276d7b606e74326375
2018-01-23 22:51:15 +00:00
Edwin Wong
73bb243699
Add tests to validate key length for clearkey plugin. am: c312e21b5e
-s ours
...
am: 4a9b599f9a
-s ours
Change-Id: I0e1f4a9ce50dc8d354d6a51d6a85a3ca0ed275ce
2018-01-23 22:51:13 +00:00
Android Build Merger (Role)
14747ae4f0
Merge "Merge "Don't send more than 2K to addRngEntropy" into oreo-vts-dev am: b461eafa23
-s ours am: 73c30b0870
-s ours" into oc-mr1-dev
...
am: e9bc8f0dac
-s ours
Change-Id: I8d124a6069e4cd258232509fdce5a8cfab776d7f
2018-01-23 22:51:08 +00:00
Android Build Merger (Role)
6dc35f01c5
Merge changes from topic "am-c310f9b4-18a7-4504-8179-49be1ab1d4a7" into oc-mr1-dev
...
* changes:
[automerger] Fix VTS test which turns off radio. am: 71620817a9
-s ours am: 986facc698
am: 379ad11204
[automerger] Fix VTS test which turns off radio. am: 71620817a9
-s ours am: 986facc698
Fix VTS test which turns off radio. am: 71620817a9
-s ours
2018-01-23 22:51:01 +00:00
Android Build Merger (Role)
1f657da4f7
Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b
-s ours am: b2b0cd70fa
-s ours" into oc-mr1-dev
2018-01-23 22:50:52 +00:00
Android Build Merger (Role)
9e7aae44f3
Merge "Update broadcastradio HAL 1.0 VTS tests. am: aab4a1a574
-s ours am: fa0c4e6f1f
-s ours" into oc-mr1-dev am: f1870460f9
-s ours
...
am: e43c593eeb
-s ours
Change-Id: I9682ed260a304efe1180fba522cc11437da41ca2
2018-01-23 22:50:52 +00:00
sqian
de21da743e
Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b
-s ours
...
am: b2b0cd70fa
-s ours
Change-Id: Ia61e14f71692e30d1203f9c9b69d4a0ced0f8c03
2018-01-23 22:50:47 +00:00
Android Build Merger (Role)
b304cf5f60
[automerger] Allow partially dynamic profile in the audio policy config am: e54b381d9d
-s ours am: b9cd8a6512
am: 71a744665c
...
am: af50b95e94
Change-Id: Ife726975e415965399c931d847a4e5eed11a940d
2018-01-23 22:50:46 +00:00
Android Build Merger (Role)
df88b401e8
[automerger] Fix VTS test which turns off radio. am: 71620817a9
-s ours am: 986facc698
am: 379ad11204
...
Change-Id: Icbe9ae49d033a2e7cad56243239ccc02e81db94f
2018-01-23 22:50:40 +00:00
Android Build Merger (Role)
379ad11204
[automerger] Fix VTS test which turns off radio. am: 71620817a9
-s ours am: 986facc698
...
Change-Id: I0c6733ca4e40dda29f06c064594bee485f9d587d
2018-01-23 22:50:38 +00:00
Android Build Merger (Role)
9cfdb08456
Merge "Fix VTS test which turns off radio. am: 71620817a9
-s ours am: 0cc426f287
-s ours" into oc-mr1-dev
2018-01-23 22:50:33 +00:00
Android Build Merger (Role)
213105fe06
Merge "bug fix: disable timestamp deviation test for audio decoder am: c4e3cc8b51
-s ours am: 0be554b166
-s ours" into oc-mr1-dev
...
am: 8e80a3f0e1
-s ours
Change-Id: Ia51bbe9136971f1d1d43f7c3d909f071941e74c9
2018-01-23 22:50:33 +00:00
Sanket Padawe
a1a7a56eb2
Fix VTS test which turns off radio. am: 71620817a9
-s ours
...
am: 0cc426f287
-s ours
Change-Id: If66cc54839cb731ab3021acfe047481e42240ae0
2018-01-23 22:50:27 +00:00
Android Build Merger (Role)
5931b68e5e
Merge changes from topic "am-89fe5346-d048-4a7e-b219-5691d6788fba" into oc-mr1-dev am: 8d35fd363c
...
am: bcd17495ab
Change-Id: I9439bd4c9a190ea022ce6dccc0985374c06627ed
2018-01-23 22:50:25 +00:00
Android Build Merger (Role)
dcd415607b
Merge changes from topic "am-2bdda567-72b2-4e25-9a99-dfd3ec839928" into oc-mr1-dev
...
am: 38b7eabb2e
Change-Id: I83a64d559db6602635bdaa4b95c00ae7c6df555c
2018-01-23 22:50:02 +00:00
Android Build Merger (Role)
68fc8a9048
Merge "VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
-s ours am: 2af656a3ea" into oc-mr1-dev
2018-01-23 22:49:59 +00:00
Iris Chang
b84f2a896c
VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
-s ours
...
am: 2af656a3ea
Change-Id: Idd256513bc3a432ce36a4e20b99e6d1835006c0e
2018-01-23 22:49:55 +00:00
Sanket Padawe
986facc698
Fix VTS test which turns off radio.
...
am: 71620817a9
-s ours
Change-Id: I1dfab7819d794788706ddce53dc2a0e1c36b2866
2018-01-23 22:49:54 +00:00
Android Build Merger (Role)
1a6ddb5bef
Merge "bug fix: handle OMX_EventBufferFlag events am: 7409a9312d
-s ours am: 5f17d44600
-s ours" into oc-mr1-dev am: 6e3c3e851f
-s ours
...
am: b9aaf6989e
-s ours
Change-Id: Iaccfe19bbc3afb86d924a1b5b88e2dde9029865f
2018-01-23 22:49:54 +00:00
Android Build Merger (Role)
4210a69e9c
Merge "Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev am: d5c6411aeb
-s ours am: c0e92d519e
-s ours" into oc-mr1-dev
...
am: 3fe7a30c97
-s ours
Change-Id: I5c8796ca99bcaeb16cbbd65a7c0b5e7c2dd57940
2018-01-23 22:49:41 +00:00
Android Build Merger (Role)
db14d3a991
Merge changes from topic "am-c3548d64-0940-4c1d-b786-8c3f6bfc3870" into oc-mr1-dev
...
* changes:
[automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
am: 349de81afa
am: dcccdb5450
[automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
am: 349de81afa
VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
2018-01-23 22:49:40 +00:00
Kevin Rocard
d7f0e6698c
Audio VTS: do not test duplicate policy configuration file am: 68d4dd6e85
-s ours
...
am: 19ce816981
-s ours
Change-Id: Ib1156b21c1d802fb190dfb9435d8d6f2796d2560
2018-01-23 22:49:34 +00:00
Android Build Merger (Role)
9220874679
Merge "Skip direct report test if sensor is not available am: c9c4ba222b
-s ours am: 7c8df54d68
-s ours" into oc-mr1-dev am: bdcceee2c7
-s ours
...
am: 71c0001ac2
-s ours
Change-Id: I8a214ada59b95f34f94b0e4c2f2c05dcf181b8da
2018-01-23 22:49:31 +00:00
Android Build Merger (Role)
947ce7161f
[automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
am: 349de81afa
am: dcccdb5450
...
Change-Id: I28c437bd5b578c37db101cdb1c948c37574c0556
2018-01-23 22:49:22 +00:00
Android Build Merger (Role)
05991fba31
Merge "bug fix: output colorformat configuration fixed am: 56906949cc
-s ours am: 86995ef4e4
-s ours" into oc-mr1-dev
...
am: 9088105332
-s ours
Change-Id: I86620992415ba954711e33ed3f60ad17b799c4cc
2018-01-23 22:49:21 +00:00
Android Build Merger (Role)
dcccdb5450
[automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036
am: 349de81afa
...
Change-Id: Id7eb1efe28a1162e3c1f622aa98eda902f1bed15
2018-01-23 22:49:20 +00:00
Kevin Rocard
4235f7f883
Audio VTS: remove expectation of policy configuration unicity am: 9c4e363a70
-s ours
...
am: 330909404a
-s ours
Change-Id: I30a039aa769063b0933cf13aabc6d1f29cf449a0
2018-01-23 22:49:14 +00:00
Android Build Merger (Role)
0dd483360a
Merge "Reduce max keymaster message size to 2K am: a0b9b39647
-s ours am: 0448a9a2c5
-s ours" into oc-mr1-dev am: 109188325c
-s ours
...
am: 2365fc54d3
-s ours
Change-Id: Iab92b185d16cecaec81c191f62931869a816c8e4
2018-01-23 22:49:08 +00:00
Iris Chang
349de81afa
VTS: fix VtsHalKeymasterV3_0Target issue
...
am: af5fad4036
Change-Id: I139f6a801391577bd9919f31fb62d1f3aaf97462
2018-01-23 22:49:00 +00:00
Android Build Merger (Role)
896b94bafc
Merge "Merge "bug fix: configure input port buffer size" into oreo-vts-dev am: ccc3c36c88
-s ours am: fcaa3c4dbe
-s ours" into oc-mr1-dev
...
am: 118c2b3ebf
-s ours
Change-Id: Ic325eba8be667e2bda652bed7b85cd5e0a1711d1
2018-01-23 22:47:16 +00:00
Android Build Merger (Role)
8c6f64dbef
Merge "nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 6753a9be72
-s ours am: 8bd3ee8792
-s ours" into oc-mr1-dev am: e12b1bd926
-s ours
...
am: 584d2c8ea3
-s ours
Change-Id: Ib4fb19683709021d7ffb56c7ad3520bb74900b52
2018-01-23 22:47:05 +00:00
Android Build Merger (Role)
e43c593eeb
Merge "Update broadcastradio HAL 1.0 VTS tests. am: aab4a1a574
-s ours am: fa0c4e6f1f
-s ours" into oc-mr1-dev
...
am: f1870460f9
-s ours
Change-Id: I2976e516cb0f76feed7236964d91d306cf71e376
2018-01-23 22:46:57 +00:00