Commit Graph

10985 Commits

Author SHA1 Message Date
Yuyang Huang
fc83170c70 Add newApi linter check for mDNS library
The mDNS library need to be backported to some internal library which
support minSdk 21. Therefore, updated the build rules to add the linter
check.

Bug: 296175311
Test: TH
Change-Id: Iae0bffa315dc6de2339a05f595b13480fa7385ae
2023-09-12 19:01:21 +09:00
Yuyang Huang
fca402abed Add test for downstream tethering
Add end-to-end testing for testing NsdManager advertising and
discovering works fine with downstream tethering interfaces.

Bug: 281639507
Test: atest NsdManagerTest
Change-Id: I5a66423f216cfe0c82db5128502c885980ab264b
2023-09-12 17:53:37 +09:00
Paul Hu
f5ee683cbd Merge "Correct isLegacy metric data" into main am: 046b0c1c82
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745877

Change-Id: Icd79d1af11839f6ddaa914a86843540418b29b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:52:09 +00:00
Mike Yu
384effd6c2 Merge "Add sim card requirement for CtsNativeNetDnsTestCases" into main am: 8c02f03949
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745876

Change-Id: I93e98d6ea8cc01265b14ef251af9b9d01a7de75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:50:54 +00:00
Paul Hu
ce60253a4a Merge "Correct isLegacy metric data" into main am: 046b0c1c82
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745877

Change-Id: I43761168a40cab0e39039643487b9a7c3cc633ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:49:53 +00:00
Mike Yu
0b4bf45cef Merge "Add sim card requirement for CtsNativeNetDnsTestCases" into main am: 8c02f03949
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745876

Change-Id: I57d85da8f4e29a5d2e10dcfbfe4c3ae2a7313570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:49:23 +00:00
Paul Hu
046b0c1c82 Merge "Correct isLegacy metric data" into main 2023-09-12 08:41:10 +00:00
Paul Hu
326c22ff39 Fix flaky test: testOnNetworkConnectivityReportedFalse
The test flake is likely caused by a carrier configuration
update. After the update is complete, the shell permission is
dropped, which causes the test network setup to fail due to a
lack of permission. The test network setup should also be
protected by a synchronized lock to avoid permission lost.

Bug: 296980394
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest \
      --iteration 50
Change-Id: I3c7a0a92cddeb7c0f41a11b929f72714f8b22c05
2023-09-12 16:31:10 +08:00
Mike Yu
8c02f03949 Merge "Add sim card requirement for CtsNativeNetDnsTestCases" into main 2023-09-12 07:59:36 +00:00
Paul Hu
508a012b2e Correct isLegacy metric data
The isLegacy field of Nsd metrics should indicate whether the
data was collected from the old backend or not. However, it is
currently only dependent on the ENABLE_PLATFORM_MDNS_BACKEND
compat change value, which is incorrect. This is because the
NsdService always uses the new backend since Android U,
regardless of the compat change value. Therefore, the isLegacy
data should be obtained from each transaction.

Bug: 287546772
Bug: 299880473
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I156abd656b90578d710696a69ccf7dfca97a2c9c
2023-09-12 01:20:00 +00:00
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
Jean Chalard
ef2bb73172 Merge changes I0afdda02,I1c47f616 into main am: 5f730c6ab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2460069

Change-Id: Ib9b13167b5d9e22057f96d675f7f2f7d712a4907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 11:42:57 +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
940d33071a 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: I6901fbd6b209abb906886317055c64bf81f2d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 20:30:49 +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
0768c55e15 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: I012961546ec87fe53976d69d5fa5334e33a6517e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:06:48 +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
bdb036c650 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: I24e831717ee2baded3156d2d673892082fe9273c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 14:06:19 +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
796b879235 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: I583249819174589ff1cbefbba1de3c548a2ed04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 13:18:22 +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
e4de3152b3 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: I0317ef3f600c1d5e6e69fc4d640900fafedd87be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 10:02:22 +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
a4a323d421 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: I718e1251ce1b6a82abfde049db8403b2eaa79ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:01:23 +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
b7f8eca3b7 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: I2a1a8ccd5425aaff3cea64e19c29b80f58824e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 16:37:01 +00:00
Maciej Żenczykowski
8eac29e909 Merge "Convert ProcNetTest to JUnit4." into main am: 7d2678c424
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742376

Change-Id: I26d2a48f4f7f0b7eb84aad494a877e5744699c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 16:36:44 +00:00
Maciej Żenczykowski
090c1b0ba7 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: I6ec0f9c12790122463959d13c72e4ac00d1e2ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 16:36:26 +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
Yuyang Huang
fb47d0c799 Send rawOffloadPacket to OffloadEngine
Add the missing logic to send the rawOffloadPacket to OffloadEngine.

Bug: 297314970
Test: atest
(cherry picked from https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2730493)

Ignore-AOSP-First: Merge conflict on this branch
Change-Id: I897d5077bd82f14340efa07d8012dae17a1d1b87
2023-09-06 11:54:24 +09:00