Commit Graph

10985 Commits

Author SHA1 Message Date
Junyu Lai
59ce1f1fcc Invoke setDataEnabled instead of setDataEnabledForReason on R device
There was no such method in R release, use SdkLevel to check
framework version and use different API accordingly.

Test: TH
Fix: 297768044
Change-Id: I357c0d56646ffd5eb018b6bb4efe47d4c48e71d3
2023-09-06 10:52:18 +08:00
Yuyang Huang
74c5b24801 Merge "Send rawOffloadPacket to OffloadEngine" into main am: a337d95cc4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2730493

Change-Id: If3a845d966fca2377bc3977e39a0e39cb1756c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:00:06 +00:00
Yuyang Huang
a337d95cc4 Merge "Send rawOffloadPacket to OffloadEngine" into main 2023-09-06 00:04:00 +00:00
Paul Hu
b9d47216be Report more advertising metrics data
Report more advertising metrics data below when the service is
unregistered.
- Replied request count (sum across interfaces)
- Sent packet count (including announcements and probes)
- Number of conflicts during probing
- Nubmer of conflicts after probing

Bug: 287546772
Test: atest FrameworksNetTestCases NsdManagerTest
Ignore-AOSP-First: BB on this branch when running TH on AOSP.
Change-Id: I50c54a35dc523422e3a7302c059bbbc38eac5631
2023-09-05 15:12:35 +00:00
Paul Hu
88239ccb0a Disable cache flush bit in existing announcement
Per RFC6762#10.1, the cache flush bit should be false for
existing announcement. Otherwise, the record will be deleted
immediately when receiving this response.

Bug: 299054783
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I8bf1a5b1914b49720862836abb543b232185f5f5
2023-09-05 17:54:55 +08:00
Motomu Utsumi
debcae9d03 Merge "Delay frozen app sockets close until the cellular modem wakes up" into main am: 4e95ea0740
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2608568

Change-Id: Ibd5e4dedd28e2b813f44af97f9a33c0227c133f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 09:41:04 +00:00
Motomu Utsumi
25bc872fc2 Merge "Delay frozen app sockets close until the cellular modem wakes up" into main am: 4e95ea0740
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2608568

Change-Id: I8d5127f1adf82fa6924175a68efa08692f874fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 09:40:50 +00:00
Yuyang Huang
0989365377 Merge "Update permission check for offloadEngine registration" into main am: 65f96123a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2696893

Change-Id: I6f0d79281151c27e142540b0563bff0b9c0d963d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 09:40:41 +00:00
Yuyang Huang
8fcecf8577 Merge "Update permission check for offloadEngine registration" into main am: 65f96123a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2696893

Change-Id: I9ab6fc581c7dbb571ddf584520138be31a63d74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 09:40:25 +00:00
Motomu Utsumi
4e95ea0740 Merge "Delay frozen app sockets close until the cellular modem wakes up" into main 2023-09-05 09:11:01 +00:00
Yuyang Huang
31f6e2eccb Send rawOffloadPacket to OffloadEngine
Add the missing logic to send the rawOffloadPacket to OffloadEngine.

Bug: 297314970
Test: atest CtsNetTestCases FrameworksNetTestCases
Change-Id: I06d7a9bb84df72808eff4f0c9df60f7e60aa2a2c
2023-09-05 08:51:04 +00:00
Yuyang Huang
65f96123a2 Merge "Update permission check for offloadEngine registration" into main 2023-09-05 08:45:39 +00:00
Yuyang Huang
98a42a04d0 Merge "Send OffloadServiceInfos when registerOffloadEngine is called" into main am: 2be259b9cf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727857

Change-Id: Ief9867a92cce294a5749ecd964270b42c2994ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 07:57:45 +00:00
Yuyang Huang
e7cdcc89f1 Merge "Send OffloadServiceInfos when registerOffloadEngine is called" into main am: 2be259b9cf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727857

Change-Id: I0ef36a384b544e4b1b7171d480e2661dc0109a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 07:57:29 +00:00
Yuyang Huang
2be259b9cf Merge "Send OffloadServiceInfos when registerOffloadEngine is called" into main 2023-09-05 07:05:05 +00:00
Remi NGUYEN VAN
a4c543a95c Add back partial connectivity test to presubmit
Most failures were due to two conflicting wifi configurations being used
on the test infrastructure. Re-enable the test now that the
configurations have been updated.

Fixes: 286701510
Test: TH
Change-Id: I601c089ed4e9c6b8bfe296e05397e83ac20ff8c1
2023-09-05 15:28:49 +09:00
Yuyang Huang
8e6fbc8c1a Update permission check for offloadEngine registration
For an app to register itself as an offloadEngine, it must have either
of the following permissions: NETWORK_STACK,
PERMISSION_MAINLINE_NETWORK_STACK, NETWORK_SETTINGS,
REGISTER_NSD_OFFLOAD_ENGINE.

Bug: 294777050
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I19fe9b996a02b1ae23116c02a1b8406d93b3ecf1
2023-09-05 14:53:51 +09:00
Yuyang Huang
525a5d1090 Merge "Disable "next" targets in module release branch" into udc-mainline-prod 2023-09-04 10:51:40 +00:00
Junyu Lai
35c69c7986 Address review followup comments for NetworkStats
This change includes:
1. Mark groupedBy*() deprecated and throw after android U.
2. Modify map() to mapKeysNotNull().
3. rename clearInterfaces to withoutInterfaces and refactoring.
4. Modify tests accordingly.

Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkStatsTest
Fix: 296149902
Fix: 296150018
Change-Id: I5d97422ba957a212c0c5fbc1eee3f8b174343348
2023-09-04 18:01:14 +08:00
Motomu Utsumi
188bfd36da Delay frozen app sockets close until the cellular modem wakes up
Closing TCP sockets sends RST packets. If the cellular modem is idle,
sending RST packets will wake the modem up and consume battery.

This CL adds delay_destroy_frozen_sockets_version flag.
When this flag and destroy_frozen_sockets_version is enabled,
ConnectivityService delays closing socket until the cellular modem wakes up.
Pending frozen sockets are closed also when cellular network becomes no
longer the default network.

This CL also adds flag status and pending uids to the dump.

Bug: 284900338
Test: FrameworksNetTests
Change-Id: I2562568390dda36d02f72afb3a96f824788964c0
2023-09-04 18:04:31 +09:00
Yuyang Huang
0172b34dd3 Only use TEST_APK_NEXT starting from V am: 04d1ce9ea2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727856

Change-Id: I605e618bd252bdcf117abebf98ec9ac98457bbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 08:08:57 +00:00
Yuyang Huang
e74f645f7d Only use TEST_APK_NEXT starting from V am: 04d1ce9ea2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727856

Change-Id: Ibfe3dea23d9e40d62df76059a65bc26734a38849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 08:08:42 +00:00
Yuyang Huang
04d1ce9ea2 Only use TEST_APK_NEXT starting from V
The Next app is only necessary in development branches and right now the
in-development SDK is V.

Test: TH
Change-Id: I6aa72d70bc124ae7cf40962b172965d1f0fdb437
2023-09-03 10:21:07 +00:00
Chalard Jean
23da14cf90 Address flake in testNetworkCallbackMaximum am: 2eb2f7998d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2730494

Change-Id: Ib96d4adfbffc490537e9124c7db7a80bfbcf112e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 09:58:40 +00:00
Chiachang Wang
d83f819dab Merge "Verify reevaluation triggered when VPN validation fails" into main am: 29178c8906
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727555

Change-Id: I370aecbad0fcd511ab69577aee9ccdebb93c05d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 09:55:31 +00:00
Yuyang Huang
c275a9e7ef Send OffloadServiceInfos when registerOffloadEngine is called
When the OffloadEngine is registered, it should get notice about all the
currently offloaded service.

Bug: 297314970
Test: atest CtsNetTestCases
Change-Id: I1b977a40476a1f5c30a075b559e72656a42865ae
2023-08-31 17:44:28 +09:00
Chalard Jean
fd645e9e4c Address flake in testNetworkCallbackMaximum am: 2eb2f7998d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2730494

Change-Id: Ie913c3fba62e94c83ba5593aa0e437525beee61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 08:48:41 +00:00
Chalard Jean
2eb2f7998d Address flake in testNetworkCallbackMaximum
These flake occasionally because registering a request increases
the current request count synchronously while unregistering
decreases it asynchronously, meaning if the test has time to
call register 100 times before unregister can run it will
wrongfully flake.
This could be addressed in production code but as comments in
the change explain, this isn't worth the complexity. Hence
just have a pinpoint fix in the test. See aosp/2707373 for
what a fix in the production code would look like.

Test: manual
Bug: 289530922
Change-Id: Iad9a725eda91406f820abe4706bca0a4756352a4
2023-08-30 15:19:50 +09:00
Chiachang Wang
6205fef6db Merge "Verify reevaluation triggered when VPN validation fails" into main am: 29178c8906
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727555

Change-Id: I55fc97996205e1b8eba54f413be185bf16a09231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 04:00:34 +00:00
Chiachang Wang
29178c8906 Merge "Verify reevaluation triggered when VPN validation fails" into main 2023-08-30 03:12:42 +00:00
Chiachang Wang
3e1edc231f Verify reevaluation triggered when VPN validation fails
Update tests to verify that the underlying network reevaluation
is triggered when VPN validation status switches to unvalidated.

Bug: 296183603
Test: atest FrameworksNetTests
Change-Id: I80934cce6e7f2d56039bdd6ad63c6f7173a597cb
2023-08-30 03:08:56 +00:00
Treehugger Robot
cc39068db7 Merge "netd bpf - implement ingress discard based on {dstip,ifindex}" into main am: cabd4c4c6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2731354

Change-Id: I1a924dc43fb135b52ed9fd49da19a2c50d46748f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 00:00:48 +00:00
Treehugger Robot
a4e4577a2f Merge "netd bpf - implement ingress discard based on {dstip,ifindex}" into main am: cabd4c4c6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2731354

Change-Id: I79d476480b234dd43a3ef760f42a1dea93bb17a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 00:00:32 +00:00
Treehugger Robot
cabd4c4c6e Merge "netd bpf - implement ingress discard based on {dstip,ifindex}" into main 2023-08-29 23:13:36 +00:00
Treehugger Robot
43708c2ab0 Merge "ethernet: Wait on releaseTetheredInterface() to be processed" into main am: bf6f5b576d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2731793

Change-Id: Ieee4a706fe91ee73a3ca529c654676c9a1c2db87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:50:23 +00:00
Treehugger Robot
af8c03587f Merge "ethernet: Wait on releaseTetheredInterface() to be processed" into main am: bf6f5b576d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2731793

Change-Id: I067fdd2b1fbf4c860fab7f0acea1884f94950075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:50:15 +00:00
Treehugger Robot
bf6f5b576d Merge "ethernet: Wait on releaseTetheredInterface() to be processed" into main 2023-08-29 19:55:08 +00:00
Maciej Żenczykowski
6109d94ec5 netd bpf - implement ingress discard based on {dstip,ifindex}
Test: TreeHugger
Bug: 295800201
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I82771644045e0e37f73725730bd0bd2265ac5b77
2023-08-29 19:35:12 +00:00
Patrick Rohr
524256d457 ethernet: Wait on releaseTetheredInterface() to be processed
There is a race between releaseTetheredInterface() and a new interface
being created. Calling setEthernetEnabled(true) forces the test to wait
on a callback that is generated on the ethernet handler thread (and
therefore guarantees releaseTetheredInterface() has been processed).

Bug: 296012516
Test: atest EthernetManagerTest
Change-Id: I7a1a763ba5c1c50274a112b8c1b8c04f35696f12
2023-08-29 10:22:05 -07:00
Junyu Lai
4ff6ae5950 Merge "Split BpfNetMaps constants and utilities into standalone classes" into main am: 50a7ecccf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720877

Change-Id: I96040478955eb24870f973e8545e89a10fb2c117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 11:16:33 +00:00
Junyu Lai
597b05f5a0 Merge "Split BpfNetMaps constants and utilities into standalone classes" into main am: 50a7ecccf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720877

Change-Id: Iffedb0a57c83be761ed01d89ca819f8ec0db1656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 11:16:17 +00:00
Junyu Lai
50a7ecccf1 Merge "Split BpfNetMaps constants and utilities into standalone classes" into main 2023-08-29 10:44:51 +00:00
Paul Hu
7773671243 Merge "Add sim card requirement for net permission tests" into main am: 654c04b8a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709178

Change-Id: Ia7e2d728e65d8c573f4e5be5c609167f005e8a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 09:43:20 +00:00
Paul Hu
db7ad6b0a9 Merge "Add sim card requirement for net permission tests" into main am: 654c04b8a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709178

Change-Id: Ia85302f975b95a41c22a6b09a49ca0d18fc25cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 08:55:57 +00:00
Junyu Lai
29b7b6385a Split BpfNetMaps constants and utilities into standalone classes
This is a no-op refactoring that splits constants and utility
methods into standalone classes which will be shared with
a bpf reader class in subsequent CLs.

NO_IFTTT=No-op refactoring

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfNetMapsTest
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.net.module.util.StructTest

Bug: 297836825
Change-Id: I6d7ea044e43180ae001573009a166be74ebe6a5d
2023-08-29 08:20:10 +00:00
Paul Hu
654c04b8a4 Merge "Add sim card requirement for net permission tests" into main 2023-08-29 08:12:59 +00:00
Xin Li
207fdc7ebd Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:19 +00:00
Chiachang Wang
8a98593584 Merge "Verify VPN underlying network is set as soon as it tries to use it" into main am: 69cd0aa5a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720155

Change-Id: Ib845be1aeec9c968b1db940ed92712c742ceb9ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 10:54:07 +00:00
Chiachang Wang
69cd0aa5a0 Merge "Verify VPN underlying network is set as soon as it tries to use it" into main 2023-08-28 10:18:23 +00:00
Jean Chalard
458ee2e5a8 Merge "Request enterprise networks" into main am: 940e330f5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709074

Change-Id: I943a813de8710cfeb124c9b0bcaead01833c628c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 10:12:00 +00:00