LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,784 Commits 2 Branches 0 Tags
a4feab485a71eb9717397ea83c442ff366cbd22a
Commit Graph

45784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a4feab485a Merge "isEthernet() - ARPHRD_PPP does not require ethernet headers" am: 73b42b0f95 am: 3046820011 am: ca8500dcc2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1897432

Change-Id: I433ad51a05dbb11c61a63c4a4474e7b85d0171ec
 2021-11-22 09:27:17 +00:00
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
f6affa800b Merge "Fix a possible flake in disconnectFromWiFi" am: 1c4a66ddc4 am: 0061457a54 am: d35c7ff990 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892098

Change-Id: I143b15be049b955bf5dc2a74c4d82b9b711a1ce7
 2021-11-22 08:32:07 +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
33b7412577 Merge "Update NSD tests without AsyncChannel" am: 469d941752 am: b7fd5bd3e1 am: ee2dd397d6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1823893

Change-Id: I054e294cb32c0abf70e3ea419db09a2e492e3bc5
 2021-11-22 06:45:59 +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
Aaron Huang
3bde36484b Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0 am: 1faca14f77 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529

Change-Id: I2f4a689aae9dafbad0bb5e3cd74f43a5c72fd898
 2021-11-22 06:03:37 +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
d1ed21007a Remove unused service and test dependencies am: f96ecf2708 am: e03f77170a am: 7d865f3e10 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317

Change-Id: I22260179985637d82e20b346786bed44148e5dc2
 2021-11-19 16:27:47 +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
5859946ca3 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: c96c26077b -s ours am: caad89cf93 -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: If96692993899e74d0c80375c14897ea3df5843d9
 2021-11-18 22:25:13 +00: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
1233439894 Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b am: 65a20ad635 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477

Change-Id: Icdd62c981cbc18e6fdf47998b60b196887f182a8
 2021-11-18 12:26:30 +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
93873d956d explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8 am: 961b290878 am: a93046a9d9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606

Change-Id: I91436e8303e672455c11160390bda6597167717e
 2021-11-18 05:51:39 +00: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
Les Lee
21fe2e30d4 [automerger skipped] Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev am: 28da18e286 -s ours 
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16247421

Change-Id: I6fd2d10a258a7dd68c18cc69cb7c1493e222c512
 2021-11-18 02:05:50 +00:00
Les Lee
28da18e286 Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev 2021-11-18 01:49:03 +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
096cd70a04 Merge "Always use OWNERS from master branch." am: d8d887bd39 am: bc0c9111f3 am: 6de9d4b950 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1894899

Change-Id: I1efbeae63c7ee857bbe814da6d8f856e8c31195a
 2021-11-17 09:01:50 +00: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
bfc2b02f14 S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f am: 66bd87f0d4 am: 2f6631cd7c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101

Change-Id: I968710654234e9756ef5f3cc39a5cb4741887366
 2021-11-17 07:25:40 +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
Les Lee
109b1246c3 [conflict] Add test case to test normalize am: f444e9d182 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16214695

Bug: 206073065
Bug: 206448852
Test: Test: I solemnly swear I tested this conflict resolution.
Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27
Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
 2021-11-16 03:46:22 +00:00
Oriol Prieto Gasco
a3d2f72c82 [automerger skipped] Revert "[resolved conflict] Add test case to test normalize am: f444e9d182" am: 48683e2439 -s ours 
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16251687

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16264980

Change-Id: I14c167625d8f098388d0c3012385989af0ef2b4c
 2021-11-16 00:55:48 +00:00
Oriol Prieto Gasco
48683e2439 Revert "[resolved conflict] Add test case to test normalize am: f444e9d182" 
This reverts commit fc719b474a.

Reason for revert: DroidMonitor-triggered revert due to breakage bug b/206448852

Bug: 206448852

Change-Id: I7f685bc1b2e4b2b3b33a2d2f0e430a321d7493fe
 2021-11-15 23:39:55 +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
Les Lee
d6f2ce6fed [automerger skipped] [resolved conflict] Add test case to test normalize am: f444e9d182 am: fc719b474a -s ours 
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16251687

Change-Id: I13b7568fd53d16ad450e73d66664d6ef190b8a9e
 2021-11-15 15:39:27 +00: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