Commit Graph

10733 Commits

Author SHA1 Message Date
Jean Chalard
da62c511c0 Merge changes I0afdda02,I1c47f616 into main am: 5f730c6ab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2460069

Change-Id: I7f6aedf1424751e067e4396016bc525393381487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:00:06 +00:00
Mike Yu
a7d02ba66c Add sim card requirement for CtsNativeNetDnsTestCases
As connectivity pre-check was added to CtsNativeNetDnsTestCases
recently, this CL is needed as well.

Bug: 298886804
Test: TreeHugger
Change-Id: I3c26920e8609256470cd2b8c37fc1f33f56c39fd
2023-09-11 09:21:14 +00:00
Chalard Jean
f95e2de35a Implement ConnectivityStateMetrics sample
Test: ConnectivitySampleMetricsTest
Change-Id: I0afdda023208c3f8620cb5b89add66448af596d7
2023-09-11 17:12:46 +09:00
Chalard Jean
0f5c4fe9cb Add base classes for common ConnectivityService tests.
This sets up what is necessary for an instrumented
ConnectivityService to run. Users of this class are
meant to inherit CSTest.

This is still relatively basic and does not have all the
instrumentation in ConnectivityServiceTest. Developers
looking to extend CSTest may find some instrumentation
missing ; when they add the missing instrumentation,
they should consider whether it should be generic for all
CSTests (and put it in base/), or whether it's local to
their own test suite. This should enable faster testing
as each CSTest children will only need to set up the
instrumentation it actually needs.

This patch also migrates a basic test to have a first user.

Bug: 272685721
Test: ConnectivityServiceTest
      CSBasicMethodsTest
Change-Id: I1c47f616af90629c9cb2a6ae89d992b19863e704
2023-09-11 16:46:27 +09:00
Treehugger Robot
63b9d4a04c Merge "Address review followup comments for NetworkStats" into main am: 8df4d76aa2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2723093

Change-Id: I0a517bfebe79a8a5b69cb726b5a9200bc669685a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 21:21:19 +00:00
Treehugger Robot
8df4d76aa2 Merge "Address review followup comments for NetworkStats" into main 2023-09-08 20:11:03 +00:00
Sudheer Shanka
c06c6c594a Merge "Increase the timeout waiting for the test app's network status." into main am: f58fd8442d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2738073

Change-Id: Iebe7d0bc873d13f41cf649a681cf0506ff48833b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:08:02 +00:00
Sudheer Shanka
f58fd8442d Merge "Increase the timeout waiting for the test app's network status." into main 2023-09-08 17:40:45 +00:00
Yuyang Huang
88975b233b Merge "Add Chicken bit for the mDNS offload feature" into main am: 169de9c8a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745014

Change-Id: I70e2946ff634af9b46acb83de0d6cf3439eaf549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 14:06:02 +00:00
Yuyang Huang
169de9c8a1 Merge "Add Chicken bit for the mDNS offload feature" into main 2023-09-08 13:25:53 +00:00
Paul Hu
e11634f603 Merge "Disable cache flush bit in existing announcement" into main am: af511b5abe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742353

Change-Id: I01a63151f26fc787d9ebea0c5af850c11188a0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 13:18:14 +00:00
Paul Hu
af511b5abe Merge "Disable cache flush bit in existing announcement" into main 2023-09-08 12:48:05 +00:00
Yuyang Huang
b96a071f51 Add Chicken bit for the mDNS offload feature
Bug: 297482971
Test: TH
Change-Id: I6f2cdd066d9047b113ff80211cf6d4c6fa605104
2023-09-08 17:42:26 +09:00
Sudheer Shanka
0f53262c7b Increase the timeout waiting for the test app's network status.
Bug: 298729534
Test: atest com.android.cts.net.HostsideConnOnActivityStartTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eaf030ea96f3af817e8b301c8edf48f79d7f229d)
Merged-In: I58a23e927cd14b973048e34566350eeef215f7db
Change-Id: I58a23e927cd14b973048e34566350eeef215f7db
2023-09-08 06:55:36 +00:00
Chiachang Wang
6c9969492c Verify that VPN name is set in VPN networks am: 5ee9dedb0f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2732954

Change-Id: I4c645f688990ad815915b7f09e81fdbfe3bc4f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 10:02:32 +00:00
Chiachang Wang
5ee9dedb0f Verify that VPN name is set in VPN networks
Verify that the extra info for validation logs in the
NetworkInfo is set.

Bug: 297790570
Test: atest FrameworksNetTests
Change-Id: I5b77b3bab30154b7979cda003274cde0d834a5fb
2023-09-07 09:22:24 +00:00
Junyu Lai
8d4145cc1f Merge "Invoke setDataEnabled instead of setDataEnabledForReason on R device" into main am: 7145c5c1fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742354

Change-Id: I34668a2924323a47f47de65aa808f81470b4afe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:01:22 +00:00
Junyu Lai
7145c5c1fe Merge "Invoke setDataEnabled instead of setDataEnabledForReason on R device" into main 2023-09-07 01:36:58 +00:00
Maciej Żenczykowski
ecbf512dba Merge "cts: enforce cubic only on V+" into main am: 4f28615724
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742375

Change-Id: Ie211602143f6c284016ba21f555b9c8a1eb3466f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 16:41:36 +00:00
Maciej Żenczykowski
21fa775301 Merge "Convert ProcNetTest to JUnit4." into main am: 7d2678c424
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742376

Change-Id: I95de37cdac802768e13ad1ebbdbd7970b21fc2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 16:41:11 +00:00
Maciej Żenczykowski
e22bbb4d3c Merge "Fix lint errors in ProcNetTest." into main am: e491e563a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742355

Change-Id: Ic348a7d4f527c56ec8bf8fafb97ba6ca51712258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 16:39:40 +00:00
Maciej Żenczykowski
4f28615724 Merge "cts: enforce cubic only on V+" into main 2023-09-06 16:07:11 +00:00
Maciej Żenczykowski
7d2678c424 Merge "Convert ProcNetTest to JUnit4." into main 2023-09-06 16:06:18 +00:00
Maciej Żenczykowski
e491e563a9 Merge "Fix lint errors in ProcNetTest." into main 2023-09-06 16:04:35 +00:00
Paul Hu
c169bbffef Report more advertising metrics data am: 043bcd4537
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2658555

Change-Id: I3c46dfe065ddb15ea6b35ac03938455b14c6054d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 08:51:01 +00:00
Maciej Żenczykowski
9fe823e34f cts: enforce cubic only on V+
Test: TreeHugger
Bug: 291025434
Bug: 289802481
Bug: 294510745
Change-Id: I3c9646468834305e48c531040640e05f80b1c5e7
2023-09-06 17:15:54 +09:00
Lorenzo Colitti
9ae344b81a Convert ProcNetTest to JUnit4.
This allows using assumptions to skip tests.

Test: atest CtsHostsideNetworkTests
Change-Id: Ic1fc41c1ca0c30b6b7350c413d710d959b9a5013
2023-09-06 17:13:17 +09:00
Lorenzo Colitti
ab5e0c98f0 Fix lint errors in ProcNetTest.
Test: test-only change
Change-Id: If3702cf9c3a36e3b7cb1853784f1a8ff98d7be07
2023-09-06 16:08:00 +09:00
Paul Hu
043bcd4537 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
Merged-In: I50c54a35dc523422e3a7302c059bbbc38eac5631
Change-Id: I50c54a35dc523422e3a7302c059bbbc38eac5631
2023-09-06 11:26:53 +08:00
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
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
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
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
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
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
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
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