Diego Wilson
efb41275bd
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679 am: 7fe9553d96 am: 786b335242
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1433255
Change-Id: Ibe7289d478056b15263d013310b8ba11a498c751
2020-09-21 21:27:50 +00:00
Diego Wilson
786b335242
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679 am: 7fe9553d96
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1433255
Change-Id: I00277fded511292958e0f0cdb45f9b94a989c7db
2020-09-21 21:00:09 +00:00
Diego Wilson
7fe9553d96
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1433255
Change-Id: I498f1856c8d44c8c326b0118f3ebd8cc6483cf2b
2020-09-21 20:03:48 +00:00
Diego Wilson
4737502679
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL"
...
* changes:
Revert "Change HIDL fmq tests to use int32_t for payload"
Revert "Add template parameters to MQDescriptor"
2020-09-21 19:44:34 +00:00
Diego Wilson
9719e2d984
Revert "Change HIDL fmq tests to use int32_t for payload"
...
Revert "Change payload type to int32_t for fmq device tests"
Revert submission 1431616-thirtytwo
Reason for revert: This topic broke the aosp_x86-userdebug target. Details at http://b/169077648
Reverted Changes:
If736389eb:Add template parameters to MQDescriptor
Ice9c28c3d:Change HIDL fmq tests to use int32_t for payload
Ia18d8459b:Add template arguments to MQDescriptor for AIDL
I95586cc83:Change payload type to int32_t for fmq device test...
Change-Id: Iaf37a5dca7a915f098e49ecb076c0932eb60e0c3
2020-09-21 19:36:49 +00:00
Diego Wilson
b26628ac32
Revert "Add template parameters to MQDescriptor"
...
Revert "Change payload type to int32_t for fmq device tests"
Revert submission 1431616-thirtytwo
Reason for revert: This topic broke the aosp_x86-userdebug target. Details at http://b/169077648
Reverted Changes:
If736389eb:Add template parameters to MQDescriptor
Ice9c28c3d:Change HIDL fmq tests to use int32_t for payload
Ia18d8459b:Add template arguments to MQDescriptor for AIDL
I95586cc83:Change payload type to int32_t for fmq device test...
Change-Id: Ib7c409b164c76517d642a415cdfc2406e4f2f351
2020-09-21 19:36:49 +00:00
Devin Moore
3519518dc1
Merge changes from topic "thirtytwo" am: ab05f6310d am: 327be8c123 am: 99097b0f72
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431700
Change-Id: Iea6c5ec5389cac49940b75bae9e66dfa50a612b7
2020-09-21 17:31:43 +00:00
Devin Moore
913bfbf823
Change HIDL fmq tests to use int32_t for payload am: 0a10d6918c am: 606d2ec362 am: 5b1514cb70
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431692
Change-Id: I42c80aa8cd2e182167ac3e930f573b31045d6118
2020-09-21 17:31:40 +00:00
Devin Moore
99097b0f72
Merge changes from topic "thirtytwo" am: ab05f6310d am: 327be8c123
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431700
Change-Id: I030e7bca3384577dc4b8faa0cd26477c3835cc15
2020-09-21 17:09:45 +00:00
Devin Moore
5b1514cb70
Change HIDL fmq tests to use int32_t for payload am: 0a10d6918c am: 606d2ec362
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431692
Change-Id: Ide560d85c648e2b52410cb4aabf8665e7b5311c0
2020-09-21 17:09:43 +00:00
Devin Moore
327be8c123
Merge changes from topic "thirtytwo" am: ab05f6310d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431700
Change-Id: I4fb548eb4997daeb03999dacd71ea2e073c472fc
2020-09-21 16:50:46 +00:00
Devin Moore
606d2ec362
Change HIDL fmq tests to use int32_t for payload am: 0a10d6918c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431692
Change-Id: I3c0aa7c8dacfd68978eb71617b20df97d12706be
2020-09-21 16:50:09 +00:00
Devin Moore
ab05f6310d
Merge changes from topic "thirtytwo"
...
* changes:
Add template parameters to MQDescriptor
Change HIDL fmq tests to use int32_t for payload
2020-09-21 16:18:51 +00:00
Bill Yi
0b4150b8a4
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace am: 700ea48cb9 -s ours am: e5d83604e4 -s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: I376296eadeb06892b15fdc4b910486f5e20ab11c
2020-09-19 07:01:30 +00:00
Bill Yi
f939f3c833
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c am: e19854ca4c -s ours am: be54ee14d4 -s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: Ia8ae02ea4b014d6935a58baa79233509b9e7d692
2020-09-19 07:01:02 +00:00
Bill Yi
e5d83604e4
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace am: 700ea48cb9 -s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: I4eaeeb21000083f14aac4b750b12bc8c13b388eb
2020-09-19 05:51:36 +00:00
Bill Yi
be54ee14d4
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c am: e19854ca4c -s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: Ibc933fe71e7fcdce2cae9fc19017810caa78a79c
2020-09-19 05:50:39 +00:00
Bill Yi
700ea48cb9
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: Icf2e7b0f8668fbf0c928a023bc9ed0690f61b295
2020-09-19 05:24:18 +00:00
Bill Yi
e19854ca4c
Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: I1f7c50d9bf05fb576e5f7aaee02bfb14995db90a
2020-09-19 05:22:48 +00:00
Bill Yi
7a7e6e5ace
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Devin Moore
340f895d30
Add template parameters to MQDescriptor
...
First parameter is used to determine the type of the payload, and the
second parameter is used to determine the type of queue.
Added two types to be use in that second parameter.
SynchronizedReadWrite and UnsynchronizedWrite.
Test: atest fmq_unit_tests fmq_test
Bug: 142326204
Change-Id: If736389ebecd02b87879850714606523e5145579
2020-09-18 10:55:15 -07:00
Treehugger Robot
12069ba334
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38 am: ed6abddaf8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451
Change-Id: I884143be08a9ac914836d896597ba6db63fdf8d9
2020-09-18 17:20:18 +00:00
Treehugger Robot
ed6abddaf8
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451
Change-Id: I2aa2077cffbbee18a0cd25acb46c3a8e0c4b6f14
2020-09-18 16:31:22 +00:00
Devin Moore
0a10d6918c
Change HIDL fmq tests to use int32_t for payload
...
This is in preperation for more AIDL fmq testing. The types need to be
the same and AIDL does not support unit16_t.
Test: atest fmq_test fmq_unit_tests
Bug: 142326204
Change-Id: Ice9c28c3d0df064ea43c31950b3438d2e0d19063
2020-09-18 09:29:01 -07:00
Treehugger Robot
83a6256f38
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451
Change-Id: I5f911153e314d0c81c4abc806a57a91c440260c7
2020-09-18 16:03:25 +00:00
Treehugger Robot
d56db87577
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device"
2020-09-18 15:19:25 +00:00
Bill Yi
da6ac34b4c
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: I115103a3400648975f1ec13f1616cc05ef205679
Change-Id: I853d3172cf4703b56bfce403d5018c403b38abef
2020-09-17 21:57:06 -07:00
Yifan Hong
54b5003b09
Merge "Reorder/cleanup FCM exempt list #4 (media bufferpool)" am: e2ed8135cd am: 6bbaf817cc am: a1fade51b7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427725
Change-Id: Ia9252e89df401a4d8aa77462cbbb69b514cea47d
2020-09-17 22:11:36 +00:00
Yifan Hong
a1fade51b7
Merge "Reorder/cleanup FCM exempt list #4 (media bufferpool)" am: e2ed8135cd am: 6bbaf817cc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427725
Change-Id: I115103a3400648975f1ec13f1616cc05ef205679
2020-09-17 21:25:05 +00:00
Yifan Hong
6bbaf817cc
Merge "Reorder/cleanup FCM exempt list #4 (media bufferpool)" am: e2ed8135cd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427725
Change-Id: I8a6f669d5b8e83dff6be2c5dffc5255f65781e7c
2020-09-17 20:56:52 +00:00
Yifan Hong
e2ed8135cd
Merge "Reorder/cleanup FCM exempt list #4 (media bufferpool)"
2020-09-17 19:10:24 +00:00
Treehugger Robot
e9089d18ef
Merge "wifi: Call terminate in VTS teardown" am: 226727ca88 am: 188a7b6bbf am: 6718df8902
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427815
Change-Id: I613fa8aac4d502bdd4247153e24a4c77a69f0896
2020-09-17 10:34:06 +00:00
Treehugger Robot
6718df8902
Merge "wifi: Call terminate in VTS teardown" am: 226727ca88 am: 188a7b6bbf
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427815
Change-Id: I6c449c10f8200c66df4f183df348d7744cba3865
2020-09-17 10:00:21 +00:00
Treehugger Robot
188a7b6bbf
Merge "wifi: Call terminate in VTS teardown" am: 226727ca88
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427815
Change-Id: Ie0f0d5629341854125bc06915aa3fb7cfd5cd823
2020-09-17 09:19:16 +00:00
Treehugger Robot
bb913aa46f
Merge "wifi: Added capability check in RTT tests" am: 08c0142b21 am: cabeb6149b am: c418575f39
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428450
Change-Id: I015ba1073aaeb236bd7a9ed8e46ef8083ab13664
2020-09-17 09:18:55 +00:00
Treehugger Robot
226727ca88
Merge "wifi: Call terminate in VTS teardown"
2020-09-17 08:28:14 +00:00
Treehugger Robot
c418575f39
Merge "wifi: Added capability check in RTT tests" am: 08c0142b21 am: cabeb6149b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428450
Change-Id: I1b36177052e1bb33def059b75b90ef4240e040a3
2020-09-17 07:37:14 +00:00
Treehugger Robot
cabeb6149b
Merge "wifi: Added capability check in RTT tests" am: 08c0142b21
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428450
Change-Id: I4a2ffe51de5e88cd94c0493e963823a6ae799be7
2020-09-17 06:54:02 +00:00
Treehugger Robot
08c0142b21
Merge "wifi: Added capability check in RTT tests"
2020-09-17 06:13:34 +00:00
Les Lee
d7f1b09d74
[automerger skipped] Merge "vts: Fix incorrect instance name in Teardown" am: 19cc21ea41 am: 5679f91584 -s ours am: f6841c3276 -s ours
...
am skip reason: Change-Id I8215cba3e2a36f48863f57e199684c7446e20692 with SHA-1 a6cc5825e9 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427816
Change-Id: Id1519edcebe4833dad175941ff379339f0cbda57
2020-09-17 04:44:26 +00:00
Yifan Hong
a40a55aa3e
Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51 am: d0fd20654c am: 7a3eedb0dd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427726
Change-Id: I68c717a5e6f2dae0398378a2371eba98d25e5042
2020-09-17 04:42:42 +00:00
Les Lee
f6841c3276
[automerger skipped] Merge "vts: Fix incorrect instance name in Teardown" am: 19cc21ea41 am: 5679f91584 -s ours
...
am skip reason: Change-Id I8215cba3e2a36f48863f57e199684c7446e20692 with SHA-1 a6cc5825e9 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427816
Change-Id: Ia25a33ea9fd08c220842a87103cd46f859d8aae8
2020-09-17 01:25:10 +00:00
Yifan Hong
7a3eedb0dd
Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51 am: d0fd20654c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427726
Change-Id: Ia122d1d85b3e7948c1e334c62e67815508061f75
2020-09-17 01:25:04 +00:00
Les Lee
5679f91584
Merge "vts: Fix incorrect instance name in Teardown" am: 19cc21ea41
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427816
Change-Id: I5f2b582c23a3de99fe0ae00e8222b1e08449b9ec
2020-09-17 01:13:29 +00:00
Yifan Hong
d0fd20654c
Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427726
Change-Id: Ibde5dde9c389f615719e6dff2d61aa37792c205f
2020-09-17 01:04:07 +00:00
lesl
0a43f6dc11
wifi: Call terminate in VTS teardown
...
When OEM register different hostapd instance without update the StopHostapd.
It will cause VTS clean fail because hostapd process name is the new
one.
Call terminate to request clean HAL state.
Bug: 161682236
Bug: 167636313
Test: atest -c VtsHalWifiHostapdV1_2TargetTest
Test: atest -c VtsHalWifiHostapdV1_1TargetTest
Test: atest -c VtsHalWifiHostapdV1_0TargetTest
Change-Id: If56e5b5351abd31865150bdf97d27674dbbc4257
2020-09-17 00:57:17 +00:00
Les Lee
19cc21ea41
Merge "vts: Fix incorrect instance name in Teardown"
2020-09-17 00:56:50 +00:00
Yifan Hong
a2f5b0bc51
Merge changes I267b3ae9,Ic14d2257
...
* changes:
Reorder/cleanup FCM exempt list #3 (fastboot)
Reorder/cleanup FCM exempt list #2 (audio)
2020-09-17 00:22:01 +00:00
NukemZHYu
5508e51c5c
camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device
...
change (getCameraDeviceVersion(mProviderType, name) to (getCameraDeviceVersion(name, mProviderType)
Avoid Camera HAL 1 Device fail on Status(EX_TRANSACTION_FAILED): 'BAD_TYPE:
Bug: 168676352
Test: run commandAndExit vts -m VtsHalCameraProviderV2_5Target
Change-Id: Icb164538bbc357e22412a7320bb721c220c24a4c
2020-09-16 21:00:33 +00:00
Treehugger Robot
91116d98ed
[automerger skipped] Merge "Add Tuner HAL and TvInput HAL VTS tests into the exception list of the uninstantiated parameterized tests." am: c9e5075d36 am: 59c180354a -s ours am: 02da184e97 -s ours
...
am skip reason: Change-Id I7a2ad0e8a43c6262628354be316c530ab00ac520 with SHA-1 0857d7caa0 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428008
Change-Id: I2058589741cfda3186713d04fd4fce93b51a913a
2020-09-16 20:40:03 +00:00