system-hardware-interfaces

Fork

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: c2e1ca1aac

Change-Id: I66031f4bd7b288e4ab6564939a238bcfc31ab9e7

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: Id45caa0bfe6e942d9bdb835dc87345a87071bba3

Fix NetdHidlTest.TestAddRemoveInterfaces() am: 84777b06df am: 073f5088c5
am: 3780461012

Change-Id: I8b34e566af1c564f49c2f59462a0ef8af843cf79

Fix NetdHidlTest.TestAddRemoveInterfaces() am: 84777b06df
am: 073f5088c5

Change-Id: I1af658298b2fc10c857de01cff3a31a5e5c158e6

Fix NetdHidlTest.TestAddRemoveInterfaces()
am: 84777b06df

Change-Id: I8aea1d82b2bf3b55505f22a4f79d8d257a4341ea

Fix NetdHidlTest.TestAddRemoveInterfaces()

The regex in countRulesForFwmark() overeagerly matched rules ending
in the same hex digit. For instance, fwmark=3 would match both these
lines:

from all fwmark 0xd0003/0xdffff iif lo lookup netd13474_27190
from all fwmark 0x10063/0x1ffff iif lo lookup local_network

This fix consists in matching either just 0x3, or the zero-padded 0003.

Bug: 74922133
Test: as follows:
m VtsHalNetNetdV1_1TargetTest && \
adb push out/.../VtsHalNetNetdV1_1TargetTest /data/ && \
adb shell /data/VtsHalNetNetdV1_1TargetTest
Change-Id: If6df9fa6cf843a5593ce61d87366c23383bb4d81
(cherry picked from commit 64848957ba49275896c80790ceeeb6219930f687)

Snap for 4751833 from 64848957ba49275896c80790ceeeb6219930f687 to pi-release

Change-Id: Ic167b25d177db6ad0c9204f66ed148d33e99a74a

Fix NetdHidlTest.TestAddRemoveInterfaces() am: 64848957ba
am: fc0701b4e0

Change-Id: I1f90f51156393b94853edf75b95fb932798d56dd

Fix NetdHidlTest.TestAddRemoveInterfaces()
am: 64848957ba

Change-Id: I6915ed661784663ae10cb593e1081ea9c8c688f3

Fix NetdHidlTest.TestAddRemoveInterfaces()

The regex in countRulesForFwmark() overeagerly matched rules ending
in the same hex digit. For instance, fwmark=3 would match both these
lines:

from all fwmark 0xd0003/0xdffff iif lo lookup netd13474_27190
from all fwmark 0x10063/0x1ffff iif lo lookup local_network

This fix consists in matching either just 0x3, or the zero-padded 0003.

Bug: 74922133
Test: as follows:
m VtsHalNetNetdV1_1TargetTest && \
adb push out/.../VtsHalNetNetdV1_1TargetTest /data/ && \
adb shell /data/VtsHalNetNetdV1_1TargetTest
Change-Id: If6df9fa6cf843a5593ce61d87366c23383bb4d81

Snap for 4693621 from 9a9a0772bc04427f3cc23289501a6b56463d1db1 to pi-release

Change-Id: I24dc0eba050216b702dc2e831055251fc87c0e52

Merge "update OWNERS for VTS" into pi-dev am: 9a9a0772bc
am: c0c619034a

Change-Id: I33585e9ffcded3f82a13855ee300ef4d0ce8877b

Merge "update OWNERS for VTS" into pi-dev
am: 9a9a0772bc

Change-Id: I49a76fb5f97b5dc40880e740ab775bb92b3e83aa

[automerger skipped] Add tests for INetd 1.1. am: f95d0c28b6 -s ours
am: 464ffdab87 -s ours

Change-Id: I84cf8539ed879ba90ef4117784da2027640c1f20

[automerger skipped] Make the VTS tests for the INetd HAL 1.0 more realistic. am: 65ae996fca -s ours
am: bd4c4a8212 -s ours

Change-Id: I228d79921fd9e1c4eadc99cf33355c496a88d75b

Merge "update OWNERS for VTS" into pi-dev

[automerger skipped] Add tests for INetd 1.1.
am: f95d0c28b6 -s ours

Change-Id: If776ebfdd2f0791ac63581f5c4bd9db4f1dc647d

[automerger skipped] Make the VTS tests for the INetd HAL 1.0 more realistic.
am: 65ae996fca -s ours

Change-Id: I95315fe8cf41fbae8b99b250eb72a5748577958b

update OWNERS for VTS

Test: inspection
Bug: 75325573
Change-Id: I61c0d7fd4c4ca49e9370c8dc2bcfc5e00812aec1

Add tests for INetd 1.1.

Bug: 73032258
Test: VtsHalNetNetdV1_0TargetTest and VtsHalNetNetdV1_1TargetTest passes on marlin
Change-Id: Id4d49f08563982353a9a7db79b569e933ea03c46
Merged-In: Id4d49f08563982353a9a7db79b569e933ea03c46
(cherry picked from commit 94832f94dc902b130bf3b2814e9addc2f27a2840)

Make the VTS tests for the INetd HAL 1.0 more realistic.

The VTS test for the netd HAL creates an OEM network, but it
doesn't check whether the network exists. Fix that by using
the native multinetwork API calls to select the network.
Also, check that when an OEM network is created, there are no IP
rules that select for its fwmark. There should be none because
a network that has just been created has no interfaces.

Put utility code into a new VtsHalNetNetdTestUtils static library
to avoid code duplication when we add new tests for future HALversions.

Bug: 73032258
Test: VtsHalNetNetdV1_0TargetTest passes on marlin
Change-Id: I345b9b27d7c2c8bdd6ce6d60430490dac8c3a989
Merged-In: Ie574990f7640fdc7d83ccd58baf6dfe1069a3654
(cherry picked from commit 79f693702c35dca81f7390d1619736a204e61a70)

Snap for 4662252 from 61323db76114d7115ad44281eba81801a562828c to pi-release

Change-Id: Iabd6928174603f91e1d4cf3790d338ee0156a169

Freeze HALs for Android P am: 61323db761
am: 9cd1369a1b

Change-Id: Ia4667f8dbd73ffa00b63c9dc36c5212547068153

Freeze HALs for Android P
am: 61323db761

Change-Id: I3899796c588e5254a2b6ce4ca5beb6556ebc50dd

Freeze HALs for Android P

Bug: 68112778
Test: none
Change-Id: Ic3617e937a4589f5ef6a40b4831c9a77328215e0

Add tests for INetd 1.1. am: 94832f94dc am: 2cf1f13200
am: 46a1712e3a

Change-Id: Icf67cd17090351d79baf995fb551b56b69abc453

Add tests for INetd 1.1. am: 94832f94dc
am: 2cf1f13200

Change-Id: Ib42934f33261172bd8e9884fabbb814491067b59

Add tests for INetd 1.1.
am: 94832f94dc

Change-Id: Ie8e6da55140ff1f1e42731e9ce41ca08f864ca96

Make the VTS tests for the INetd HAL 1.0 more realistic. am: 79f693702c am: 065b170e64
am: 3958a97f77

Change-Id: I08463decaf16eb7374ee13dea93ed3ddf275441b

Make the VTS tests for the INetd HAL 1.0 more realistic. am: 79f693702c
am: 065b170e64

Change-Id: Ie574990f7640fdc7d83ccd58baf6dfe1069a3654