Treehugger Robot
ca8500dcc2
Merge "isEthernet() - ARPHRD_PPP does not require ethernet headers" am: 73b42b0f95 am: 3046820011
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1897432
Change-Id: I0f1ffa66075256d9829e379279d5e2a917d559e4
2021-11-22 09:17:43 +00:00
Treehugger Robot
3046820011
Merge "isEthernet() - ARPHRD_PPP does not require ethernet headers" am: 73b42b0f95
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1897432
Change-Id: I560b34da41630c16977614a1a1e4770672dcf022
2021-11-22 09:06:23 +00:00
Treehugger Robot
73b42b0f95
Merge "isEthernet() - ARPHRD_PPP does not require ethernet headers"
2021-11-22 08:53:28 +00:00
Treehugger Robot
d35c7ff990
Merge "Fix a possible flake in disconnectFromWiFi" am: 1c4a66ddc4 am: 0061457a54
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892098
Change-Id: I6855dfc35028aeec5d3d5ae9200beeec06504032
2021-11-22 08:17:43 +00:00
Treehugger Robot
0061457a54
Merge "Fix a possible flake in disconnectFromWiFi" am: 1c4a66ddc4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892098
Change-Id: I6df297447ade42e38963855809c499c55b6ea85c
2021-11-22 07:53:43 +00:00
Treehugger Robot
1c4a66ddc4
Merge "Fix a possible flake in disconnectFromWiFi"
2021-11-22 07:34:57 +00:00
Remi NGUYEN VAN
ee2dd397d6
Merge "Update NSD tests without AsyncChannel" am: 469d941752 am: b7fd5bd3e1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1823893
Change-Id: I0b0dcad8e790d0e1f7a37aa27bd778e9ec4fd297
2021-11-22 06:35:27 +00:00
Remi NGUYEN VAN
b7fd5bd3e1
Merge "Update NSD tests without AsyncChannel" am: 469d941752
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1823893
Change-Id: I897bdce6cdaf4ea390d8ce6be03b87bacd6da82e
2021-11-22 06:19:18 +00:00
Remi NGUYEN VAN
469d941752
Merge "Update NSD tests without AsyncChannel"
2021-11-22 05:58:15 +00:00
Aaron Huang
1faca14f77
Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529
Change-Id: Id9b717824540504570de9b4c27503f04c2b41fda
2021-11-22 05:53:14 +00:00
Aaron Huang
4fc403c3b0
Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529
Change-Id: Id685a51b37d59a822aaa9307f9d4b55053211612
2021-11-22 05:41:34 +00:00
Aaron Huang
c7037475fa
Merge "Use real ProxyTracker in ConnectivityServiceTest"
2021-11-22 05:25:28 +00:00
Remi NGUYEN VAN
7d865f3e10
Remove unused service and test dependencies am: f96ecf2708 am: e03f77170a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317
Change-Id: I86b43cdf7f28d640f0598238141490996036c4aa
2021-11-19 16:17:44 +00:00
Remi NGUYEN VAN
e03f77170a
Remove unused service and test dependencies am: f96ecf2708
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317
Change-Id: I677a6b4c0b68648b4fab0e6f67edc88aa8be77b2
2021-11-19 15:59:07 +00:00
Remi NGUYEN VAN
f96ecf2708
Remove unused service and test dependencies
...
Nothing uses StateMachine in service-connectivity, and
FrameworksNetTestsLib pulled a lot of unused dependencies with
services.core and services.net.
Remove unused dependencies. This helps measure code coverage more
accurately.
Bug: 207020032
Test: atest ConnectivityCoverageTests
Change-Id: I39857865594a3263c4b1deeda23312c8e4f86a77
2021-11-19 21:14:39 +09:00
Maciej Żenczykowski
c8c36b9407
isEthernet() - ARPHRD_PPP does not require ethernet headers
...
(this is required to make ipv6 tethering work with at least S.LSI modems)
Test: TreeHugger
Bug: 207057951
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ic178db928ec7f74f69d7d4739b3b8439ff026625
2021-11-18 23:31:56 -08:00
Xin Li
caad89cf93
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: c96c26077b -s ours
...
am skip reason: Merged-In I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8 with SHA-1 67ee516732 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16278867
Change-Id: Ic59ae51eb3fc341e90d645b4da319c0447fbdccc
2021-11-18 22:00:57 +00:00
Xin Li
c96c26077b
Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master
2021-11-18 21:29:06 +00:00
Treehugger Robot
65a20ad635
Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477
Change-Id: Iccc7f22c470cbc5c38b156c60452659d982309b2
2021-11-18 12:14:16 +00:00
Treehugger Robot
d42bf9e53b
Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477
Change-Id: I3e3d8fde1970407f40657136d3a411008aaa99c0
2021-11-18 11:56:24 +00:00
Treehugger Robot
2c75c0444d
Merge "Disable CtsNetTestCases if needed"
2021-11-18 11:43:07 +00:00
Remi NGUYEN VAN
cd4b4ee973
Update NSD tests without AsyncChannel
...
Update the tests to use the newer NsdManager based on Binder interfaces
instead of AsyncChannel.
Bug: 190249673
Test: atest NsdManagerTest NsdServiceTest
Change-Id: I0991b598331e335a0bc211f010da7f034fb2441b
2021-11-18 18:22:45 +09:00
Maciej Żenczykowski
a93046a9d9
explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8 am: 961b290878
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606
Change-Id: I4f7d7d9b376df392ce64aebe752cb8196269af1a
2021-11-18 05:35:51 +00:00
Maciej Żenczykowski
961b290878
explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606
Change-Id: I39b24e96b5adc766473e7d369b44f5bfbdc40e5c
2021-11-18 05:18:15 +00:00
Maciej Żenczykowski
a457bf7ea8
explicitly specify that offload.o & test.o bpf programs are S+
...
Note: due to the release version of the Connectivity/Tethering mainline
module being built from sc-mainline-prod, this won't actually take effect
until system/bpf bpfloader at version 0.6+ is merged in to that tree.
This doesn't really matter, since currently things default to v0.0+.
But there is no mainline module updatable pre-v0.2 supported OS
anyway. BpfLoader v0.2 is what shipped in Android S Beta 4 through
Android S Final.
Before S there simply was no bpfloader support for mainline updatable
ebpf code, while S Beta 3 and earlier shipped v0.0 which is badly
incompatible with even the current version of the mainline module.
Additionally v0.0 doesn't even parse this field, while v0.1 which
does was very short lived [~3 days] and can thus be utterly ignored.
As such this change is effectively a no-op, and even post merge
of bpfloader v0.6+ into sc-mainline-prod will still be effectively
a no-op.
So why do it? I want to explicitly document that these programs are S+,
so that I can change the default in the future to be T+.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I7e5d0124700c7045abe16b1f3b504c9e88054ff2
2021-11-17 12:04:44 -08:00
Treehugger Robot
6de9d4b950
Merge "Always use OWNERS from master branch." am: d8d887bd39 am: bc0c9111f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1894899
Change-Id: If564e6af51a39593195f8ad160bea80fdbf12732
2021-11-17 08:45:14 +00:00
Treehugger Robot
bc0c9111f3
Merge "Always use OWNERS from master branch." am: d8d887bd39
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1894899
Change-Id: I7767c1ec16b4a4dcc0becdc134f195c1edd66cb0
2021-11-17 08:07:38 +00:00
Treehugger Robot
d8d887bd39
Merge "Always use OWNERS from master branch."
2021-11-17 07:55:00 +00:00
Chalard Jean
2f6631cd7c
S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f am: 66bd87f0d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101
Change-Id: Iddb56ae95da59cfc9bc45b2f6139b1a578ad0c9d
2021-11-17 07:15:12 +00:00
Chalard Jean
66bd87f0d4
S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101
Change-Id: Idfb993a40d43a4ead862c229c93b8cb680b7bc1a
2021-11-17 06:49:44 +00:00
Maciej Żenczykowski
101f39bb66
Always use OWNERS from master branch.
...
Since you cannot include yourself we need an extra level of indirection,
to make sure that OWNERS remains current even in historical branches.
Also vastly increase the number of OWNERS
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I19723fd9fbcee8fe3d8c9386ec5290d2764f2104
2021-11-17 05:58:02 +00:00
Taras Antoshchuk
bc3f86dfa3
Disable CtsNetTestCases if needed
...
Apply NetworkStackNextEnableDefaults to CtsNetTestCases to disable it
in branches where NetworkStackNext and related targets should not be
built.
Test: presubmit
Change-Id: I850b4294aa4c3c01f8871760185ca7fedc0f8584
2021-11-15 17:40:42 +01:00
Chalard Jean
dece0d805f
S- not to crash on NetworkInfo(null) or setDetailedState(null)
...
When NetworkInfo(null) or setDetailedState(null, any, any) are
called, S used to not crash but plant a null bomb for later
which may explode in some calls (notably, parceling) : see the
bug referenced below for details.
To help catching these errors earlier a patch was made to crash
as soon as one of these methods is called with a null argument,
but this will also crash incorrect use on existing code that
may never actually step on the mine, crashing code that used not
to crash. For safety, implement the new behavior only on T.
Bug: 145972387
Test: NetworkInfoTest
Change-Id: Ib710497d83b2d26439c2bd4d2f572310db97d6fd
2021-11-15 21:18:25 +09:00
Aaron Huang
e3879abb07
Use real ProxyTracker in ConnectivityServiceTest
...
Currently CS test uses a mock ProxyTracker object to verify that
the sendProxyBroadcast() is called. Also, if the network is a
default network then sendProxyBroadcast() will be indirectly
called in setDefaultProxy(). This only verifies that the method
is called but it doesn't verify that the broadcast is sent.
Instead of testing setDefaultProxy() is called, it is better to
verify that the broadcast is actually sent. Therefore, use a
real ProxyTracker in the test to verify the broadcast is sent.
Test: FrameworksNetTests:ConnectivityServiceTest
Change-Id: Id5c9e07e8326f24bd2665b4bb08f96d6d57d999c
2021-11-15 20:01:12 +08:00
Chalard Jean
05c291e5a3
Fix a possible flake in disconnectFromWiFi
...
1. There is a theoretical issue where the callback is not yet
registered when wifi is disabled, but there is no evidence
of it actually happening
2. 2 minutes timeout makes no sense for these tests that have a
total 1 minute timeout anyway
Bug: 196387278
Test: CtsNetTestCases
Change-Id: I120af9b312ca34431d0e62dd85233fcdaa1b09b9
2021-11-15 11:58:07 +00:00
Les Lee
63077d4c7c
[automerger skipped] Add test case to test normalize am: f444e9d182 -s ours
...
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 5299a2b307 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16214695
Change-Id: I4bd575a0a26c0a4deacc6ca87373c7aa55e39e24
2021-11-12 11:03:36 +00:00
Maciej Żenczykowski
d8594a51fa
Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53 am: 0a34b679f4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108
Change-Id: I413e270249599c23b7d0980ab21a2d13be3c913b
2021-11-11 14:19:29 +00:00
markchien
7e7b752079
Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba am: 6d52305aa9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530
Change-Id: Iff63a9588d74a43346d9c18729c0e9f0e1a1b21e
2021-11-11 14:19:27 +00:00
Maciej Żenczykowski
0a34b679f4
Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108
Change-Id: I1cd2bb86d2307965e635a61cb11324794681726c
2021-11-11 14:02:36 +00:00
markchien
6d52305aa9
Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530
Change-Id: I39d4a2a9bc402d3ea8f33a1ce5dfec6cb91f4b15
2021-11-11 14:02:34 +00:00
Maciej Żenczykowski
694ecd1c53
Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108
Change-Id: I14463253c218b1a6f7964566fbc1c93fe48de672
2021-11-11 13:42:41 +00:00
markchien
de93cf9aba
Rename tethering jni and get the jni by its package name am: f967b11087
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530
Change-Id: Icc18029f126a4845d6d2071d9e36458cbab4c313
2021-11-11 13:42:39 +00:00
Maciej Żenczykowski
ff81692077
Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni"
...
* changes:
Rename libbpfmapjni and include bpf common util library
Rename tethering jni and get the jni by its package name
2021-11-11 13:19:48 +00:00
Treehugger Robot
511e606557
Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033 am: 56d7b04870
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235
Change-Id: I4ed04aa023e712715f96c930cd9fbac7ff012a2f
2021-11-11 08:14:19 +00:00
Treehugger Robot
56d7b04870
Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235
Change-Id: Ifc7daa30ed3b963a2ba2991626eea59d16c8a682
2021-11-11 08:02:01 +00:00
Treehugger Robot
d5ad273033
Merge "replace R + 1 with S" am: 7eb9f88a6e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235
Change-Id: I81fd120c00c876399a69644fa2fe2dd2738b2310
2021-11-11 07:41:53 +00:00
Treehugger Robot
7eb9f88a6e
Merge "replace R + 1 with S"
2021-11-11 07:26:39 +00:00
markchien
782a56809b
Rename libbpfmapjni and include bpf common util library
...
1. libbpfmapjni.so is rename to libnet_utils_device_common_bpf.so
2. net-utils-device-common-bpf.jar is separated from
net-utils-device-common-netlink.jar
Bug: 205088391
Test: atest TetheringTests
atest CtsTetheringTest
atest TetheringPrivilegedTests
Change-Id: If59b35b3429ebd597c18678499ff458183f89026
2021-11-11 13:49:15 +08:00
Remi NGUYEN VAN
3598bd16b6
Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5 am: dbb110de2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835
Change-Id: I8841bbb775f966beda2e5a4d081f452490af7985
2021-11-11 05:22:40 +00:00
Remi NGUYEN VAN
dbb110de2d
Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835
Change-Id: I8b9d732884b6c2344e1fccfe786ac2dc5aad6b23
2021-11-11 05:10:26 +00:00