Commit Graph

44595 Commits

Author SHA1 Message Date
Treehugger Robot
b6b9322f01 Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported" am: 1d2ad89424 am: 5c7e4c179b am: 24713b1f4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755630

Change-Id: Ie6d68159a07d7890d4b6d39a4be4c0869a91c9b9
2021-07-07 04:41:00 +00:00
Treehugger Robot
51f17658d0 Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1 am: b9b4ee6d0e am: 0c865b6ff9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755251

Change-Id: Ia95bccb2f5be6b24ad528ee0f617085b5cf1d3c0
2021-07-07 04:40:54 +00:00
Treehugger Robot
24713b1f4c Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported" am: 1d2ad89424 am: 5c7e4c179b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755630

Change-Id: I32db3adb9f1a9c95b99ace428044e331df780821
2021-07-07 04:27:16 +00:00
Treehugger Robot
0c865b6ff9 Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1 am: b9b4ee6d0e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755251

Change-Id: I5ca65eba0f45846df6b75d11d42b67c81fb177c3
2021-07-07 04:27:08 +00:00
Treehugger Robot
5c7e4c179b Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported" am: 1d2ad89424
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755630

Change-Id: I4539d7b5d254c09d629e4d0bdb8b5db4a9d9db96
2021-07-07 04:11:26 +00:00
Treehugger Robot
b9b4ee6d0e Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755251

Change-Id: Ide762b07177c861a7308690a8e39040de2414506
2021-07-07 04:11:20 +00:00
Treehugger Robot
1d2ad89424 Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported" 2021-07-07 03:53:17 +00:00
Treehugger Robot
02ea3f55c1 Merge "Fix flake in testMobileDataAlwaysOn" 2021-07-07 03:52:38 +00:00
Remi NGUYEN VAN
5137f4f513 Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c am: 3499d73016 am: 013e9789b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756971

Change-Id: If6f17f77cbafa44153f8d856ee417e6fa82c5f6c
2021-07-07 03:45:33 +00:00
Paul Hu
5762612976 [automerger skipped] Merge "Use Netd new added/removed uid range methods" am: 51bfbbfb1b am: cef78638b5 -s ours am: 7a6f3364c9 -s ours
am skip reason: Merged-In I08bbdbcb8450b08e6208fa730137348550f9e3d2 with SHA-1 de2a23958d is already in history

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

Change-Id: I5c1d9753627dcd90d90f133b959677df5c47c8b9
2021-07-07 03:45:28 +00:00
Remi NGUYEN VAN
013e9789b7 Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c am: 3499d73016
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756971

Change-Id: Ic26bab1331de18f8b362849e275f986d0b7fa97e
2021-07-07 03:32:44 +00:00
Paul Hu
7a6f3364c9 [automerger skipped] Merge "Use Netd new added/removed uid range methods" am: 51bfbbfb1b am: cef78638b5 -s ours
am skip reason: Merged-In I08bbdbcb8450b08e6208fa730137348550f9e3d2 with SHA-1 de2a23958d is already in history

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

Change-Id: Ifa99945cc5b761eb2f1a45c21838b5db078d584b
2021-07-07 03:32:37 +00:00
Remi NGUYEN VAN
3499d73016 Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756971

Change-Id: Icb435dbe7be5eb125b88336263fd3519139501db
2021-07-07 03:21:57 +00:00
Paul Hu
cef78638b5 Merge "Use Netd new added/removed uid range methods" am: 51bfbbfb1b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755053

Change-Id: I1ab928e64501c47adbb1416555640084098cf72f
2021-07-07 03:21:51 +00:00
Remi NGUYEN VAN
527ffb6f0c Merge changes I99ce72bd,I5a11a802
* changes:
  Add retries for WifiManager#connect
  Use WifiManager.connect to reconnect wifi
2021-07-07 03:07:21 +00:00
Paul Hu
51bfbbfb1b Merge "Use Netd new added/removed uid range methods" 2021-07-07 03:07:10 +00:00
paulhu
0e79d95332 Use Netd new added/removed uid range methods
Replace network[Add|Remove]UidRanges to
network[Add|Remove]UidRangesParcel. The new methods are passing
NativeUidRangeConfig which contains priority value for each uid
range rules.

Bug: 171872461
Test: atest FrameworksNetTests
Test: atest HostsideVpnTests
(cherry-pick from ag/14911836)
Merged-In: I08bbdbcb8450b08e6208fa730137348550f9e3d2

Change-Id: I08bbdbcb8450b08e6208fa730137348550f9e3d2
2021-07-07 03:06:32 +00:00
Maciej Żenczykowski
bc23c11f6b remove obsolete/no-op NativeQtaguidTest am: 2aabf4138e am: 4f8727b8a7 am: aa6e564726
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1757412

Change-Id: I0d7c7f5d2635c9982caeebab1439e404cb7c90f2
2021-07-07 02:29:22 +00:00
Treehugger Robot
cbe5253cbe [automerger skipped] add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes am: cba9f66098 -s ours am: 2001d44cde -s ours
am skip reason: Merged-In Ibaedb8fcb28591ffba1506514f2305d55712a26b with SHA-1 bbc4ea32bc is already in history

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

Change-Id: I90be4ce14b66d199fa6956d410b7ce3551c34041
2021-07-07 02:29:16 +00:00
Treehugger Robot
56bddf410a [automerger skipped] add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes am: cba9f66098 am: 9cf3d2a8e6 -s ours
am skip reason: Merged-In Ibaedb8fcb28591ffba1506514f2305d55712a26b with SHA-1 bbc4ea32bc is already in history

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

Change-Id: I920027712db793751a3a894539fc6c6a6e377283
2021-07-07 02:28:44 +00:00
Treehugger Robot
9cf3d2a8e6 add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes am: cba9f66098
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15217930

Change-Id: If33f5d605a5bc6fea760e5c42de74f91a4a21375
2021-07-07 02:17:34 +00:00
Maciej Żenczykowski
aa6e564726 remove obsolete/no-op NativeQtaguidTest am: 2aabf4138e am: 4f8727b8a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1757412

Change-Id: Ifcfbc5d49ebffaf177ab0e5e3e500f933fd068ce
2021-07-07 02:17:15 +00:00
Treehugger Robot
2001d44cde [automerger skipped] add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes am: cba9f66098 -s ours
am skip reason: Merged-In Ibaedb8fcb28591ffba1506514f2305d55712a26b with SHA-1 bbc4ea32bc is already in history

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

Change-Id: Ie39372d2403e42bfa874000533e7eabae0e0ec05
2021-07-07 02:16:35 +00:00
Maciej Żenczykowski
4f8727b8a7 remove obsolete/no-op NativeQtaguidTest am: 2aabf4138e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1757412

Change-Id: I43c6fa74b4fbd45cd047b6169316e656debae855
2021-07-07 02:07:54 +00:00
Maciej Żenczykowski
2aabf4138e remove obsolete/no-op NativeQtaguidTest
qtaguid is long dead - test is thus a no-op

New test logs:
  Running Tests...

  x86 CtsNativeNetTestCases
  -------------------------
  CtsNativeNetTestCases (1 Test)
  [1/1] BpfTest#bpfStructSizeTest: PASSED (0ms)

  Summary
  -------
  x86 CtsNativeNetTestCases: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,

  All tests passed!

Test: atest CtsNativeNetTestCases, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9ff784dbfda0ce981904d53eacb7bc831cbe81da
2021-07-06 22:15:44 +00:00
Treehugger Robot
4c23e0ed6a Merge "add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes" am: 464d0b2bdd am: b2817e8e31 am: 58a4324397
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756440

Change-Id: I87c22e595fac530c7bd0b88008874a805cc11ff1
2021-07-06 21:25:22 +00:00
Treehugger Robot
cba9f66098 add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes
This test is required to ensure that the system is compatible
with future updates of the tethering mainline module, which
updates BPF .o files on device.

This test must already be passing on OEM devices because otherwise
the offload.o program in the Tethering mainline module would bootloop
the device.

Bug: 190519702
Test: atest CtsNativeNetTestCases, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1756440
Merged-In: Ibaedb8fcb28591ffba1506514f2305d55712a26b
Change-Id: Ibaedb8fcb28591ffba1506514f2305d55712a26b
2021-07-06 21:13:24 +00:00
Treehugger Robot
58a4324397 Merge "add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes" am: 464d0b2bdd am: b2817e8e31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756440

Change-Id: I4b57219491ad0fef352ea0d834f402fb429b67a2
2021-07-06 21:12:19 +00:00
Treehugger Robot
b2817e8e31 Merge "add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes" am: 464d0b2bdd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756440

Change-Id: I8414a4ab963e8754978c781635a66de52be39813
2021-07-06 20:58:42 +00:00
Treehugger Robot
464d0b2bdd Merge "add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes" 2021-07-06 20:44:57 +00:00
Maciej Żenczykowski
bbc4ea32bc add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes
This test is required to ensure that the system is compatible
with future updates of the tethering mainline module, which
updates BPF .o files on device.

This test must already be passing on OEM devices because otherwise
the offload.o program in the Tethering mainline module would bootloop
the device.

Bug: 190519702
Test: atest CtsNativeNetTestCases, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibaedb8fcb28591ffba1506514f2305d55712a26b
2021-07-06 02:50:47 -07:00
Remi NGUYEN VAN
00407b0c1b Add retries for WifiManager#connect
Connect can error with BUSY if the framework is busy when connect is
called. Add retries so that if this happens, the connection can succeed
after the framework stops being busy.

Also log the level of scan results when several configurations are
available, and clarify the legacy broadcast assert.

Bug: 188077861
Test: atest CtsNetTestCases
Change-Id: I99ce72bd2604489cb419ea9984643b6985728461
2021-07-06 17:53:48 +09:00
Lorenzo Colitti
3196f81770 [automerger skipped] Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true am: 1d934442ff am: c295a80bb6 -s ours
am skip reason: Merged-In I0c542560bd04e8c0a6a78d632da5a00a34d9a3fa with SHA-1 1d934442ff is already in history

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

Change-Id: I9c13824df4c7bb5798a0e02abc54c833d4072841
2021-07-06 06:23:56 +00:00
Lorenzo Colitti
a5098c7392 [automerger skipped] Enable and disable usb IpServer according to ACTION_USB_STATE am: 0450443f37 am: 10909aab6f -s ours
am skip reason: Merged-In I8375e3f998d677dc658370b2553facaec0d5ff7c with SHA-1 0450443f37 is already in history

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

Change-Id: Ib61bd641bb2243e916b7f2c55f0f76b5a85c5d32
2021-07-06 06:23:53 +00:00
Lorenzo Colitti
10be788983 [automerger skipped] Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true am: 1d934442ff -s ours am: f6137b334f -s ours
am skip reason: Merged-In I0c542560bd04e8c0a6a78d632da5a00a34d9a3fa with SHA-1 b28740ec89 is already in history

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

Change-Id: I89726f249927e4946df84e5f414747c3ac6a8b99
2021-07-06 06:19:31 +00:00
Lorenzo Colitti
37aa85cab6 [automerger skipped] Enable and disable usb IpServer according to ACTION_USB_STATE am: 0450443f37 -s ours am: 1874d956e1 -s ours
am skip reason: Merged-In I8375e3f998d677dc658370b2553facaec0d5ff7c with SHA-1 b41a00e778 is already in history

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

Change-Id: Ibcb7adc5bec8e772613b83562681d5397bd315c4
2021-07-06 06:19:28 +00:00
Remi NGUYEN VAN
e687d5844e Fix flake in testMobileDataAlwaysOn
The internal structure backing getAllNetworks is updated after
invoking lost callbacks, so the test needs to wait for the handler
to be idle before calling getAllNetworks.

Also avoid assertions in finally clauses, as it causes confusing
error messages.

Bug: 185081944
Change-Id: I8ad5ab45a3e65b0031672e6f594b1a6d6ad5abcb
Test: atest ConnectivityServiceTest
2021-07-06 06:09:17 +00:00
Lorenzo Colitti
c295a80bb6 Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true am: 1d934442ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15211236

Change-Id: I89e0fe26656528c89f5ee07490b06634081e279c
2021-07-06 06:08:04 +00:00
Lorenzo Colitti
10909aab6f Enable and disable usb IpServer according to ACTION_USB_STATE am: 0450443f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15211231

Change-Id: Ia1858bb88b169a616b0d43b5c372fb8b280b3d29
2021-07-06 06:08:02 +00:00
Lorenzo Colitti
f6137b334f [automerger skipped] Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true am: 1d934442ff -s ours
am skip reason: Merged-In I0c542560bd04e8c0a6a78d632da5a00a34d9a3fa with SHA-1 b28740ec89 is already in history

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

Change-Id: Ie6c9771352f2e153c9fc97c482fc65aaeb28fe4c
2021-07-06 06:06:44 +00:00
Lorenzo Colitti
1874d956e1 [automerger skipped] Enable and disable usb IpServer according to ACTION_USB_STATE am: 0450443f37 -s ours
am skip reason: Merged-In I8375e3f998d677dc658370b2553facaec0d5ff7c with SHA-1 b41a00e778 is already in history

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

Change-Id: If99a75e5e2ec3f20a753013f764669daf5dd5173
2021-07-06 06:06:41 +00:00
Remi NGUYEN VAN
1f210f792a Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported
The test relied on waitForIdle to ensure diagnostics callbacks were called,
but as this may require several iterations in the handler queue, this makes
the test unreliable.

Use mockito timeouts on the verify() calls instead.

Bug: 192651465
Change-Id: Iae1704af7ae3649eae301c6aee223ac753629d55
Test: atest ConnectivityServiceTest
2021-07-06 06:05:38 +00:00
Lorenzo Colitti
1d934442ff Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true
If config_tether_ncm_regexs is configured, load it to
tetherableUsbRegexs if ncm is used for TETHERING_USB. Load it to
tetherableNcmRegexs if ncm is used for TETHERING_NCM.

Bug: 185649441
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1755176
Merged-In: I0c542560bd04e8c0a6a78d632da5a00a34d9a3fa
Change-Id: I0c542560bd04e8c0a6a78d632da5a00a34d9a3fa
2021-07-06 04:32:35 +00:00
Lorenzo Colitti
0450443f37 Enable and disable usb IpServer according to ACTION_USB_STATE
Before this change, usb IpServer would be created if corresponding
interface is available even there is no enable tethering attempt. And
usb IpServer only be disabled when interface is removed. Usb tethering
could not be stopped if interface is always avaialbe.
After this change, usb IpServer would be enabled and disabled according
to ACTION_USB_STATE.

Bug: 185649441
Test: atest TetheringCoverageTests
      atest MtsTetheringTestLatestSdk
      atest CtsTetheringTest
Original-Change: https://android-review.googlesource.com/1731453
Merged-In: I8375e3f998d677dc658370b2553facaec0d5ff7c
Change-Id: I8375e3f998d677dc658370b2553facaec0d5ff7c
2021-07-06 04:22:21 +00:00
Lorenzo Colitti
84caeab48e Merge "Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true" am: 844ca1290e am: 51f5f61742 am: 25423d4f5e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755176

Change-Id: I211a29bfc81d132d757f7bd0510c1c232d68890a
2021-07-06 04:15:18 +00:00
Lorenzo Colitti
01d234cee6 Merge "Enable and disable usb IpServer according to ACTION_USB_STATE" am: d479e694f0 am: 736df2cb2f am: 86d7e6bbb4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731453

Change-Id: I008bc04b74c83c97c49f90fb66323eb55ce34915
2021-07-06 04:15:10 +00:00
Lorenzo Colitti
25423d4f5e Merge "Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true" am: 844ca1290e am: 51f5f61742
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755176

Change-Id: Iceb3d25f31da76f4f12115a7ceabd68a81faebfa
2021-07-06 04:04:42 +00:00
Lorenzo Colitti
86d7e6bbb4 Merge "Enable and disable usb IpServer according to ACTION_USB_STATE" am: d479e694f0 am: 736df2cb2f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731453

Change-Id: I334710d0bbbe18a769a79fb58d10a558dd8f7b37
2021-07-06 04:04:36 +00:00
Lorenzo Colitti
51f5f61742 Merge "Load ncm regexs config to tetherableUsbRegexs if isUsingNcm=true" am: 844ca1290e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755176

Change-Id: I5c7cb78792108b89b366da9528ffae424331aba9
2021-07-06 03:51:26 +00:00
Lorenzo Colitti
736df2cb2f Merge "Enable and disable usb IpServer according to ACTION_USB_STATE" am: d479e694f0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731453

Change-Id: Ic250214e5e731aa2505620703e53dfa2083bffa6
2021-07-06 03:51:19 +00:00