Commit graph

49,220 commits

Message SHA1
Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

CP note: the Merged-In ID is not the actual Change-Id of this change in
tm-dev. This change was originally merged in aosp, but was subsequently
reverted and cherry-picked into tm-dev. The cherry-pick falsely reused
the Change-Id of the (now reverted) original change. This causes
automerger to skip this change on all branches between aosp-master and
tm-dev when the correct Merged-In ID is used. Therefore, the Merged-In
ID listed is the Change-Id of an unrelated change that is present in
tm-dev but not aosp-master.

Bug: 220017952
Test: TH
Ignore-AOSP-First: CP to make automerger happy.
Merged-In: I61c5209f50ab62327b75813804bde1aa1a014054
Change-Id: I4c204a8489c0be006c00581d833f2bb46ae0e71d

Patrick Rohr   commited 2022-03-23 11:45:06 +00:00
37f302e109
Merge "Fix proto invalid write type" am: a036ac4569
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005290

Change-Id: Ieab8013148bc33fdfc09f36bb1148f58618512f8

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-03-22 12:33:57 +00:00
fc91e9d11f
Merge "Fix proto invalid write type"
Aaron Huang   authored and   Gerrit Code Review   commited 2022-03-22 12:18:39 +00:00
a036ac4569
[automerger skipped] Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" am: a68fba1659 -s ours
am skip reason: Merged-In I4c204a8489c0be006c00581d833f2bb46ae0e71d with SHA-1 ea7e6d56f4 is already in history

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

Change-Id: I194702326881cd6eeb012bac3e7dea1672145133

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-22 10:13:32 +00:00
750e76a3f3
[automerger skipped] Revert^2 "Change Ethernet API to use OutcomeReceiver" am: 2cef8f1314 -s ours
am skip reason: Merged-In I4c204a8489c0be006c00581d833f2bb46ae0e71d with SHA-1 ea7e6d56f4 is already in history

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

Change-Id: I8e75053db9e39418ce5c56702a2cf43e7b7e8611

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-22 10:13:30 +00:00
5b3bbb9ff2
Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver""
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-22 10:00:08 +00:00
a68fba1659
Merge "ClatCoordinator: wrap clatd information" am: a59eec920c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2028283

Change-Id: I10a0c09cd6e73461c10981f89ad5a5fe18c12291

Nucca Chen   authored and   Automerger Merge Worker   commited 2022-03-22 08:46:14 +00:00
594085e774
Merge "Add executors to NsdManager" am: b58df4bf13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2027043

Change-Id: I93294667e79684652dba065583e651148a8d0991

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-03-22 08:46:00 +00:00
ef37e45e8a
Merge "ClatCoordinator: wrap clatd information"
Nucca Chen   authored and   Gerrit Code Review   commited 2022-03-22 08:40:15 +00:00
a59eec920c
Merge "Add executors to NsdManager"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-03-22 08:33:48 +00:00
b58df4bf13
ClatCoordinator: wrap clatd information
This is a preparation for accessing BPF program and map from existing
Java class. The new class ClatdTracker stores the clatd information
for forking clatd, accessing BPF maps and attaching BPF programs.
Using an object is easier to pass all required parameters and reuse
known resource.

Also refactor existing function and rename existing variables for this
commit.

Bug: 221213090
Test: atest FrameworksNetTests
Change-Id: I02ea889de89329c52710726fbcf1d2eac61707d7

Hungming Chen   commited 2022-03-22 15:20:17 +08:00
328d15271b
Fix proto invalid write type
While dumpProtoLocked is called, InvalidProtocolBufferException
occurred because types are mismatched between platform side and
module side.

netstats.proto was moved into connectivity module, both the
platform(incident.proto) and the module uses protoc-gen-javastream
to generate the Java classes from it. It should be fine since
platform includes the source of the proto, and jarjar the generated
classess in the module to avoid conflict with platform.

Bug: 218566849
Test: adb shell incident 3001
      adb shell dumpsys netstats --proto
      atest CtsIncidentHostTestCases:IncidentdTest#testIncidentReportDumpAuto
Change-Id: I09cae385050e569b1da98ad7de0e226b13ee6895
Merged-In: I09cae385050e569b1da98ad7de0e226b13ee6895

Aaron Huang   commited 2022-03-22 15:07:15 +08:00
dac7e4b84a
Merge "Extend timeout to deflake test" am: f7c071b1c4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033664

Change-Id: I106af9df7be12659cebff2f088b98a19eadbb244

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-03-22 01:01:10 +00:00
177ffffd25
Merge "Extend timeout to deflake test"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-03-22 00:43:36 +00:00
f7c071b1c4
Merge "Fix OWNERS issues" am: dc1832cd83
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2022776

Change-Id: Iafc9c40c49f2087f1ae552ef1f5a7cfee0a16364

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-03-21 11:27:05 +00:00
ac58a96c4a
Merge "Fix OWNERS issues"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-03-21 10:51:57 +00:00
dc1832cd83
Extend timeout to deflake test
CaptivePortalLoginActivity may load the page slowly in lower
performance devices. Test expects the login page to be loaded
within 10s. The flaky happened sometimes since loading page
took 10+ seconds and failed the test.

Extend the timeout from 10s to 20s to deflake the test.

Bug: 225800341
Test: atest CaptivePortalTest
Change-Id: I98ab3dbc78cb95eeee95d1c86ab286600c98390b

Chiachang Wang   commited 2022-03-21 15:50:39 +08:00
81c2d99a77
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
Bill Yi   authored and   Android (Google) Code Review   commited 2022-03-19 03:02:41 +00:00
5c101d02ed
Merge "Allow sending of Administrator UIDs for *NETWORK_STACK" am: 0e75662808
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1761211

Change-Id: I7136333339ce5819000cbdec43836fd5f1d07304

Benedict Wong   authored and   Automerger Merge Worker   commited 2022-03-19 01:50:13 +00:00
e26f8d1bfe
Merge "Allow sending of Administrator UIDs for *NETWORK_STACK"
Benedict Wong   authored and   Gerrit Code Review   commited 2022-03-19 01:33:27 +00:00
0e75662808
Merge changes from topic "QosCallbackException" am: 7a4fcf4ed1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2028285

Change-Id: I862f597bfcaeb8e99b0448d62739d42de1ea931a

Sewook Seo   authored and   Automerger Merge Worker   commited 2022-03-19 00:56:04 +00:00
7b83d68aae
Merge changes from topic "QosCallbackException"
* changes:
  CTS test for QosCallbackException
  Expose constructor of Exceptions.

Sewook Seo   authored and   Gerrit Code Review   commited 2022-03-19 00:35:28 +00:00
7a4fcf4ed1
Allow sending of Administrator UIDs for *NETWORK_STACK
This change allows callers with the NETWORK_STACK or
PERMISSION_NETWORK_STACK to receive administrator UIDs. This will be
used by the VCN to ensure that administrator UIDs are accurately
populated, ensuring that the ConnectivityDiagnostics are triggered for
the VCN.

Bug: 193204385
Test: atest ConnectivityServiceTest
Change-Id: I3ecfbef6847dcc78adac05d0229719c97e3a220c

Benedict Wong   commited 2022-03-18 21:52:57 +00:00
a5604ea50f
Merge "Setup permissions for SDK sandbox UIDs." am: b643f2a356
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2020099

Change-Id: Icca15abc84d3b51ed44b5b13c31831146648d8ab

Martijn Coenen   authored and   Automerger Merge Worker   commited 2022-03-18 13:57:45 +00:00
f67e7c6352
Merge "Setup permissions for SDK sandbox UIDs."
Martijn Coenen   authored and   Gerrit Code Review   commited 2022-03-18 13:35:51 +00:00
b643f2a356
Fix OWNERS issues
Switch to a bug template that assigns the correct group.

Consolidate into one file to make it easier for humans as well as
machines to figure out the ownership.

Remove me from per-file ownership; no longer relevant, causes
confusion.

Bug: 224454753
Test: Presubmit
Change-Id: I84bf472fe56fe3f5927a626bde06cdd8cee8353a

Alan Stokes   commited 2022-03-18 10:52:02 +00:00
eae2ff9831
CTS test for QosCallbackException
Adding CTS test coverage for Exceptions realted to QosCallback

Bug: 224059548
Test: atest CtsNetTestCases
Change-Id: Iccd1d3259961a6e4a841395175e215724895786e

sewookseo   authored and   Sewook Seo   commited 2022-03-18 10:44:31 +00:00
27447c526a
Revert^2 "Change Ethernet API to use OutcomeReceiver"
41000c6106

Merged-In: I4c204a8489c0be006c00581d833f2bb46ae0e71d
Change-Id: I42f5ca159db523f85903c411c4a4838eb324c5ad

Patrick Rohr   authored and   markchien   commited 2022-03-18 12:11:51 +08:00
2cef8f1314
Merge "Support ignoring validation failures after roam." am: 004cbbcdad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026185

Change-Id: I50fb615446b889b98ca0fe4c63bc8dc7a167a788

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-03-18 03:32:30 +00:00
2c4ba92b72
Merge "Support ignoring validation failures after roam."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-03-18 03:15:49 +00:00
004cbbcdad
Merge changes from topic "ethernetmanagertest" am: 14c851ccc3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1978069

Change-Id: I95907044d1ef728d1780f1b9bcb4a741a3213dab

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-03-18 02:51:43 +00:00
07aad5a3e0
Add a method to create a TAP interface without bringing it up. am: 333d5e52f5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987455

Change-Id: I38b1ab96f413ead1938631cce25814dceaa2ef07

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-03-18 02:51:39 +00:00
bfd75772cd
Merge changes from topic "ethernetmanagertest"
* changes:
  Add a CTS test for EthernetManager.InterfaceStateListener.
  Add a method to create a TAP interface without bringing it up.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-03-18 02:26:25 +00:00
14c851ccc3
Support ignoring validation failures after roam.
In some scenarios, Wi-Fi connectivity is disrupted after roam. If an application reacts to network errors by calling reportNetworkConnectivity(false), validation will immediately fail and the device will switch to cell data.

Add a way to ignore these validation failures for up to 10 seconds after Wi-Fi roams.

Bug: 216567577
Test: new unit tests

Change-Id: I58de486533bcc7c6e32b23536ae15bccb779e394

he_won.hwang   commited 2022-03-18 10:30:28 +09:00
881307a834
Expose constructor of Exceptions.
Exposing constructor of Exceptions for test purpose.

CTS-Coverage-Bug: 224059548
BUG: 215240597
BUG: 216368595
Test: build
Change-Id: I20af104a891e94873715ab46ecabc3e775638c8c

sewookseo   commited 2022-03-17 18:05:56 +00:00
e7c481452e
Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 2789c017e6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2030087

Change-Id: I75374042046405c438c5701413f0b4e1b3c712b0

Quentin Perret   authored and   Automerger Merge Worker   commited 2022-03-17 15:58:08 +00:00
3234a71d32
Merge "Revert "Change Ethernet API to use OutcomeReceiver""
Quentin Perret   authored and   Gerrit Code Review   commited 2022-03-17 15:26:19 +00:00
2789c017e6
Revert "Change Ethernet API to use OutcomeReceiver"
Revert "Change Ethernet API to use OutcomeReceiver"

Revert "Change network management listener to outcome receiver"

Revert submission 2028203-ethernet-outcomereceiver

Reason for revert: BuildMonitor investigating b/225169800
Reverted Changes:
I4c204a848:Change Ethernet API to use OutcomeReceiver
I7c46545a4:Change Ethernet API to use OutcomeReceiver
Id8fadfed9:Change network management listener to outcome rece...

Change-Id: Ibd1d70ac3fb691f9a777e59da4886ab60dc969ac

Quentin Perret   commited 2022-03-17 15:20:53 +00:00
41000c6106
Merge "Change Ethernet API to use OutcomeReceiver" am: a8385cc593
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2029244

Change-Id: I250cb3129fe2172082a97662640be8269ad748f8

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-17 14:18:31 +00:00
575ec9bb10
Merge "Change Ethernet API to use OutcomeReceiver"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-17 13:53:18 +00:00
a8385cc593
Add a method to create a TAP interface without bringing it up.
In S, the behaviour of createTunInterface and createTapInterface
changed so that they bring up the interface before returning it.
This makes it difficult to test code that brings interfaces up
itself, such as IpClient or EthernetManager, because the tests
cannot predict whether that code will see the interface up
or not. This leads to flaky tests and can even make it impossible
to reliably test some behaviour.

Add a method that allows the caller to specify whether to bring
up the interface or not.

Test: new codepath tested by other CL in topic
Test: existing codepaths already well-covered
Change-Id: I0f7698f4dad132f201db4203e65a78c6af564ab2

Lorenzo Colitti   authored and   Xiao Ma   commited 2022-03-17 13:42:34 +00:00
333d5e52f5
Add a CTS test for EthernetManager.InterfaceStateListener.
Test: CtsNetTestCases:android.net.cts.EthernetManagerTest
Change-Id: Ic956b5e52575a467b405fecf142c7f25925358d4

Lorenzo Colitti   authored and   Xiao Ma   commited 2022-03-17 13:42:34 +00:00
9e560d24c2
Merge "Explicitly check route type in NetworkDiagnostics" am: 1c2f79705f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784544

Change-Id: I3ad62ce4b176c4fecfc100a2171a833d3c967c96

Taras Antoshchuk   authored and   Automerger Merge Worker   commited 2022-03-17 11:33:17 +00:00
37a3fd117b
Merge "Explicitly check route type in NetworkDiagnostics"
Taras Antoshchuk   authored and   Gerrit Code Review   commited 2022-03-17 11:08:50 +00:00
1c2f79705f
Add executors to NsdManager
Add executors to APIs added in T, and overloads with Executors for
consistency to register/resolve.

Bug: 218752665
Test: atest NsdManagerTest
Change-Id: I9d89ea8352aa8274a90bf6cb273d5b45828f53cc

Remi NGUYEN VAN   commited 2022-03-17 11:01:56 +00:00
59145dc7f8
Merge changes from topic "nullable-ipconfig" am: 1b13af010a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026565

Change-Id: I3564ece377766d0e3b2cb6f98209b00dc3a60697

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-17 07:04:24 +00:00
3a74a64079
Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Change-Id: I4c204a8489c0be006c00581d833f2bb46ae0e71d

Patrick Rohr   commited 2022-03-17 07:21:33 +01:00
ea7e6d56f4
Merge changes from topic "nullable-ipconfig"
* changes:
  Add test for nullable IpConfiguration
  Add Nullable IpConfiguration to ethernet update request
  Replace assertParcelSane with assertParcelingIsLossless

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-17 06:17:02 +00:00
1b13af010a
Rename setAccessUids to setAllowedUids am: de665266cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999075

Change-Id: Ie61c0a2285c8097b30c3c00473ed97209e149f4f

Chalard Jean   authored and   Automerger Merge Worker   commited 2022-03-17 04:55:18 +00:00
eeba8050f4
Add test for nullable IpConfiguration
Test: atest EthernetNetworkUpdateRequestTest
Change-Id: Ibf565d46cfac0d44976ee6187db7234bb082da41

Patrick Rohr   commited 2022-03-16 20:29:10 +01:00
fb82c3f702