Ryan Prichard
3e5ee9a6e6
Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603
Change-Id: I69ab8927b8f8b4fc4ad559c9a65a8f4a58a4e893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:23:50 +00:00
Ryan Prichard
236bbe3305
Merge "Undefine NAN before defining it again" into aosp-main-future
2023-09-07 20:45:10 +00:00
Treehugger Robot
0cd042eadb
Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed52
am: c4e9e8e72e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745913
Change-Id: Ice41abde6b4b637f04a514dbb1b7fa01b03f9333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:49:21 +00:00
Treehugger Robot
c4e9e8e72e
Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed52
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745913
Change-Id: I833094249fc07e65dbbace20c78373ea8c5fa51d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:04:54 +00:00
Treehugger Robot
594656ed52
Merge "Migrate from android::String isEmpty to empty" into main
2023-09-07 17:20:14 +00:00
Tomasz Wasilczyk
ad5787ada5
Migrate from android::String isEmpty to empty
...
Bug: 295394788
Test: make checkbuild
Change-Id: I66604d41926df012fd5834e74818f3179b77eb02
2023-09-07 15:51:14 +00:00
Sunil Ravi
e16bd60438
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
am: 3fc9976367
am: 2b43309ef1
-s ours am: 6b17839817
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I55911d1be9964c0e4a92dcfbcf80590acb24ed1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 05:08:17 +00:00
Sunil Ravi
b0b3aec3c5
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
am: e2036014f7
-s ours am: f1b8992a9f
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I20ee8e79b959face39a40a90d0ca6dd669ad17ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 05:08:05 +00:00
Sunil Ravi
6b17839817
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
am: 3fc9976367
am: 2b43309ef1
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I746f74b9d36dd3909e4869d419c16b6483b93911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 05:06:12 +00:00
Sunil Ravi
f1b8992a9f
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
am: e2036014f7
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I3fb4c958ca058603e670bdf449e66395c24241b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 04:29:45 +00:00
Sunil Ravi
a10ffc9368
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
am: 2079fbcd04
-s ours am: d82590eda7
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I0b6baf0e425c34a65e4aea7433a772435a626718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 04:29:10 +00:00
Sunil Ravi
2b43309ef1
wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
am: 3fc9976367
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I5e5570d1325c5acae84a06abc523a1745ceb2eba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 04:23:18 +00:00
Sunil Ravi
d2d2db503e
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
-s ours am: 69a3cf679d
-s ours am: e02458828a
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: Ib70b04ff279f14707430900a41bfa4784b6467fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 04:19:20 +00:00
Sunil Ravi
d82590eda7
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
am: 2079fbcd04
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: Ifaae93324beb491fdfe4a2d8d893d407c18bcbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 03:37:30 +00:00
Sunil Ravi
3fc9976367
wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I6cb70e72fe00596fea5f62afd0a441a3f343db93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 03:30:26 +00:00
Sunil Ravi
e02458828a
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
-s ours am: 69a3cf679d
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: Ic0e8428c99962d9ba000675dde5f5e18b2625df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 03:30:21 +00:00
Sunil Ravi
e2036014f7
wifi: set join to true in p2p connect tests am: 858665687d
am: 6240c899f0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: Id60535e477c51f8d955e8f2a111355272a7d576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 03:30:14 +00:00
Sunil Ravi
69a3cf679d
[automerger skipped] wifi: set join to true in p2p connect tests am: 858665687d
-s ours
...
am skip reason: Merged-In Id5baa0f599d11a3563780aae15ff3cea0407060c with SHA-1 284883f847
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I443dbbe1c07ca458d30c66490f5819c85e5da30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:45:26 +00:00
Sunil Ravi
2079fbcd04
wifi: set join to true in p2p connect tests am: 858665687d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I961f6a8cc9569ad401a1df41f252325f94392350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:41:10 +00:00
Sunil Ravi
6240c899f0
wifi: set join to true in p2p connect tests am: 858665687d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883
Change-Id: I33ce58f24f6ee761b21a7a7f99129dd88c7ad3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:40:47 +00:00
Ryan Prichard
99a4f3cf62
Undefine NAN before defining it again
...
After upgrading libc++, math.h happens to be included at the point
where this file tries to define NAN. Redefining a macro to a different
value is an error, but #undef'ing a macro is OK even if the macro isn't
actually defined.
Bug: b/175635923
Test: treehugger
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd390faa2fcb49ce0e0ebc6ef180118ec370f957 )
Merged-In: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
Change-Id: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
2023-09-07 01:41:11 +00:00
Sunil Ravi
858665687d
wifi: set join to true in p2p connect tests
...
After adding ag/21179155, auto join flag is
not set for every p2p connect command. The tests
are passing an unknown peer MAC address to connect(). To
pass the tests, the connect should trigger a scan and
try to find this unknown mac address. So set join flag
to true to run the same scan logic.
Bug: 298310537
Bug: 268236829
Bug: 218608010
Test: atest VtsHalWifiSupplicantP2pIfaceTargetTest
Change-Id: Id5baa0f599d11a3563780aae15ff3cea0407060c
Merged-In: Id5baa0f599d11a3563780aae15ff3cea0407060c
2023-09-06 23:30:32 +00:00
Nethaji B
9b51514352
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
am: f11fff9ec4
am: 9972cec114
am: bcb229f8b8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: Icf15cb997b154283e43498c29b18f054c931dc34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 20:27:00 +00:00
Nethaji B
a4b0ad19cb
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
am: bbc9bb1f4c
am: 609127379a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I9e9e26cf393498a8ccf21171c3f0dc4284e23195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 20:26:28 +00:00
Nethaji B
bcb229f8b8
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
am: f11fff9ec4
am: 9972cec114
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I489faa86ea3d30eb0f5ef2521f37b55a51a220b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 20:23:20 +00:00
Nethaji B
609127379a
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
am: bbc9bb1f4c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: If791a8ac4a38d3695cfdd79ef3a91355ca62697b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:48:40 +00:00
Nethaji B
e423a4aa48
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 37fb2fe77d
am: e20d2cc6e7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I477bfe6a8570012e2e65e92581ea897f41c063e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:48:12 +00:00
Nethaji B
9972cec114
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
am: f11fff9ec4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I39e0ed7579b189ea0014481c88cd324650300058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:41:54 +00:00
Nethaji B
0e87a271ea
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 1c2d61fa57
am: 5c5332f235
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I18bfb07e81754cd2c7f8bb2fbaed8fab300d4cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:38:08 +00:00
Nethaji B
e20d2cc6e7
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 37fb2fe77d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I5e37d8c9f66ba3d54ad62a969735397db3d4d228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:58:07 +00:00
Nethaji B
f11fff9ec4
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: If7f33fbfac9c770065aef620508c16c61a882a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:50:23 +00:00
Nethaji B
5c5332f235
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 1c2d61fa57
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I5d4080b60dadf460c910bfbd24b11dd9afa4c46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:50:18 +00:00
Nethaji B
bbc9bb1f4c
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
am: 0b50b188b8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: If261e0b662d3ff1789ecfeae8737ef786419273c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:50:00 +00:00
Devin Moore
4d6b500150
Merge changes from topic "aosp_trunk_stable_cp" into udc-dev-plus-aosp
...
* changes:
Remove compatibility_matrix.9.xml from 'next' builds
Mark some HALs as updatable-via-apex retroactively
2023-09-06 18:18:00 +00:00
Nethaji B
1c2d61fa57
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: Ie0b7bdaf3d9d907b969e40cae85d566bc1f15048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:05:25 +00:00
Nethaji B
37fb2fe77d
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I4eade72a9c5fa16035382a52ed1d6be69edd67e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:00:56 +00:00
Nethaji B
0b50b188b8
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
am: 7d5727bf65
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I491bb5db90059ecf972c2c9e6fb6b9bf4713d2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:00:41 +00:00
Nethaji B
7d5727bf65
Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896
Change-Id: I653411aa1c02a8025c145444b6ee1f749116ee39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 17:17:15 +00:00
Alice Wang
25840d3f6a
Merge "Make android.hardware.security.rkp-rust available for virt apex" into main am: 01fc1b7279
am: e537902a03
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727795
Change-Id: I22a29aab8bae67cd0e06b979c92e963b8d60659b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 08:54:14 +00:00
Alice Wang
e537902a03
Merge "Make android.hardware.security.rkp-rust available for virt apex" into main am: 01fc1b7279
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727795
Change-Id: Ida99a60bf01d57ea1853f8b2c72746805ee20c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 08:04:00 +00:00
Alice Wang
01fc1b7279
Merge "Make android.hardware.security.rkp-rust available for virt apex" into main
2023-09-06 07:36:55 +00:00
David Drysdale
6728e640d7
Merge "Summarize security HALs" into main am: 06717b5ec2
am: d8fecae7a1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727975
Change-Id: I04108b52b235823e68dc3781d8e9e42025dbbafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 07:22:03 +00:00
David Drysdale
d8fecae7a1
Merge "Summarize security HALs" into main am: 06717b5ec2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727975
Change-Id: Ib3aa50a0fe48d6ec148f027bdcdbdcb0abe019e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 06:29:31 +00:00
David Drysdale
06717b5ec2
Merge "Summarize security HALs" into main
2023-09-06 06:04:26 +00:00
Changyeon Jo
e927deb8f8
Update OWNERS file am: bacdd1ec09
am: d095b7aafa
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740885
Change-Id: I5989f85074d670a48a51dac0f0471e3796d7e572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 05:45:56 +00:00
Changyeon Jo
d095b7aafa
Update OWNERS file am: bacdd1ec09
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740885
Change-Id: Ie6784053acee05538e6d328d98c7cea1730291a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:55:17 +00:00
Seth Moore
145d343279
[automerger skipped] Only require RKP on T+ chipsets am: 166d160b78
am: 6cc8f1e039
-s ours
...
am skip reason: Merged-In I387e5f058ada698747aac103c1745682291f2d1c with SHA-1 8be875e0d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24668282
Change-Id: I9cfb72e80726a2ab940d1ac33f5ce4f948d5720b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:49:33 +00:00
Seth Moore
6cc8f1e039
Only require RKP on T+ chipsets am: 166d160b78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24668282
Change-Id: I9d04efcf7fe7e29dc63f45b5a70226ffdf7cf5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:01:28 +00:00
Changyeon Jo
bacdd1ec09
Update OWNERS file
...
This change updates OWNERS file for EVS interface.
Bug: 299195329
Test: Manual
Change-Id: Ife421b8aa4a380d8585e6d8476f0a24f31bc2633
2023-09-06 00:57:59 +00:00
Seth Moore
166d160b78
Only require RKP on T+ chipsets
...
It turns out we had a bug (b/263844771) in how RKP support was
detected, and that was fixed. However, due to this bug, some S chipests
shipped without RKP support which is now required by the tests.
This change drops the RKP requirement from S chipsets. There should be
no new S chipsets, so this effectively grandfathers in the previous
ones that were skipped by the RKP VTS tests.
T+ tests (both VTS and other suites) will verify that RKP support is
there, so there is no gap introduced by this change.
Bug: 297139913
Test: VtsAidlKeyMintTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:8be875e0d0c18b8de67744c8b9629f2ff518dd60 )
Merged-In: I387e5f058ada698747aac103c1745682291f2d1c
Change-Id: I387e5f058ada698747aac103c1745682291f2d1c
2023-09-06 00:03:53 +00:00