Commit Graph

71599 Commits

Author SHA1 Message Date
Lucas Lin
85a4b93101 Merge "Correct the test design for network lost case" am: 678113ade7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2330434

Change-Id: I54b8a112fef8763b6a0005ea487641394a922c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 03:48:29 +00:00
Mohannad Farrag
9c2cee1701 gn2bp: Split gcc_preprocess actions into genrules
* It's not allowed to run `gcc` from within genrule in Soong. So It was an easier decision to create a cc_object and run it with a -E flag which is equivalent to what `gcc_preprocess` action does. Then perform a soong_zip on the result to generate the equivalent java file needed

Test: update_results && m cronet_aml_components_cronet_android_cronet
Change-Id: I1b2e50f1f95fbf700c1190902c716e624805a2b4
2022-12-08 12:30:47 +09:00
Lucas Lin
678113ade7 Merge "Correct the test design for network lost case" 2022-12-08 03:25:05 +00:00
Motomu Utsumi
81bb83459d gn2bp: Add compile_multilib attribute
Test: ./update_results.sh
Change-Id: I78926bf7475fb2d491ed1e18fc4327387c86ce83
2022-12-08 12:23:48 +09:00
Maciej Żenczykowski
3a71a293b4 Merge "offload.c - fix a mistake in a comment" am: 6d20bf2834
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325356

Change-Id: I070058aedf49595dc8d7581f6e0af3a2276100ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 00:16:53 +00:00
Maciej Żenczykowski
6d20bf2834 Merge "offload.c - fix a mistake in a comment" 2022-12-07 23:57:39 +00:00
Aaron Huang
614b1f42cd [automerger skipped] Fix cell stats did not increase due to rate limit in battery stats am: aa1826207a -s ours am: e9dd9fc45d -s ours
am skip reason: Merged-In I936d51f0c205640eac94f80062ad66f55df9d0df with SHA-1 3c4231d613 is already in history

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

Change-Id: I986aeedbef66eae909f8c76bec2a759c380cbee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 21:36:42 +00:00
Aaron Huang
e9dd9fc45d [automerger skipped] Fix cell stats did not increase due to rate limit in battery stats am: aa1826207a -s ours
am skip reason: Merged-In I936d51f0c205640eac94f80062ad66f55df9d0df with SHA-1 3c4231d613 is already in history

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

Change-Id: Ie562c5cd897b006cc7e84f66ac4eb43eb629ff3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 21:11:10 +00:00
lucaslin
d1938dffce Verify that the underlying network info will be cleared/sent or not
Add some checks to verify that the underlying network info will
only be cleared when the underlying network is lost, or will only
be sent when the category is not CATEGORY_EVENT_DEACTIVATED_BY_USER
and CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED.

Bug: 237050331
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ifc66658cf59481c4a9804e6933be1048f758b698
2022-12-07 09:47:38 +00:00
lucaslin
0b915e2012 Correct the test design for network lost case
For network lost case, the process should be triggered by calling
onLost() instead of triggering onClosedWithException() directly.

Bug: 237050331
Test: atest FrameworksNetTests:VpnTest
Change-Id: I32781d4ac96ee8212d1fd7ba23009293f72b442e
2022-12-07 09:42:22 +00:00
Leon Li
fe3cd519a3 Acquire a wakelock before sending KEYCODE_SLEEP
To prevent device testing via ADB over ethernet entering standby mode,
acquire a wake lock before sending KEYCODE_SLEEP to device.

We might lose connection when device entering standby mode, end up fail the test.

Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_whitelisted

Bug: 233154541

Change-Id: I09e0af35d32a8001913d3414c0c41ffbb10ace3d
Merged-In: Icb28d2db6f25bd12ba00f56e5d6e56fa108bdcbd
2022-12-07 08:08:37 +00:00
Motomu Utsumi
f23836c0e3 Merge "Enable java bpf map always in U devices" am: ae4431aadc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2330094

Change-Id: I81d0c5df028e316ff168def14ff8fddd4b6567ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 07:51:32 +00:00
Motomu Utsumi
ae4431aadc Merge "Enable java bpf map always in U devices" 2022-12-07 07:29:54 +00:00
Paul Hu
aba7fc39f8 Merge "Add onServiceNameDiscovered/onServiceNameRemoved" am: 3b1703007e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2240978

Change-Id: I0b058eee78ae62cba1872d72f0a41d4dc52f7f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 03:51:21 +00:00
Paul Hu
3b1703007e Merge "Add onServiceNameDiscovered/onServiceNameRemoved" 2022-12-07 02:00:33 +00:00
Hungming Chen
7af74d7095 DO NOT MERGE: don't test BPF tethering offload in CTS
testTetherUdpV4AfterR verifies BPF map content that is going to
break on Android 13 devices with newer mainline module versions
which are going to support CLAT tethering offload.

The CLAT tethering offload requires BPF map format modification
which will break CTS for T.

This is for Android 13 only because testTetherUdpV4AfterR is
added since T and the BPF offload test has been moved from CTS
to MTS.

Changes:

Before:
- testTetherUdpV4UpToR: test tethering basic function on R.
- testTetherUdpV4AfterR: test tethering basic function and BPF
  tethering offload on S+.

After:
- testTetherUdpV4: test tethering basic function on R+.
  (renamed from testTetherUdpV4UpToR)
- testTetherUdpV4AfterR: (suppressed)

Bug: 258637850
Test: atest EthernetTetheringTest
Change-Id: Ia75347094fd7819c5dc68e05fcaac5c698c7729e
2022-12-06 15:39:25 +00:00
Mark Chien
20f8bddc17 Merge "Increased the timeout from 5 to 30 seconds" am: 7e60552183
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2330133

Change-Id: I423a2b1ce003b3c00a7bbec122cf74ec04dc70f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 15:24:34 +00:00
Mark Chien
7e60552183 Merge "Increased the timeout from 5 to 30 seconds" 2022-12-06 14:53:44 +00:00
Paul Hu
0ee75422c9 Add onServiceNameDiscovered/onServiceNameRemoved
Add onServiceNameDiscovered method which is used to listen the
discovery callbacks. It would be called once the service is found
even the response is incomplete. This is different from
onServiceFound which needs to receive a complete response.

onServiceNameRemoved is used for service removal if received
response is incomplete.

Bug: 254166302
Test: atest FramworksNetTests
Change-Id: I03313b045d74bb65f7fe6ac93673f02ce3b2c664
2022-12-06 10:29:26 +00:00
Chris Ye
7efae207d2 Add polling for WifiManager#getConnectionInfo
In Cts test after disabling Wifi, the WifiManager#getConnectionInfo will
not return network id -1 immediately. Need to poll the wifi disabled and
the network connection info cleared before asserting the connection
info.

Bug: 252869312
Test: atest ConnectivityManagerTest#testRejectPartialConnectivity_TearDownNetwork
Change-Id: If88261b0d81c1dc1731c683513878d054d2cb0dc
2022-12-06 00:50:26 -08:00
Hungming Chen
b58191dee8 Test: rename EthernetTetheringTest to CtsEthernetTetheringTest
Bug: 250552545
Bug: 258637850
Test: atest CtsEthernetTetheringTest
Change-Id: I76e687fc46f89fcfce9049ac6736bb078df06ecc
2022-12-06 15:46:23 +08:00
Mark Chien
82eb31b346 Increased the timeout from 5 to 30 seconds
Increase the timeout to deal with the flaky test.

Bug: 260073439
Test: TH

Change-Id: I653d80cfa97256e139f8cf989a085b1133732092
2022-12-06 06:51:03 +00:00
Thiébaud Weksteen
ec9b3372ee Merge "Relocate NetworkManagementServiceTest to framework" am: b865214380
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325061

Change-Id: I36650636aa75dd28e967ef237308d3554d452289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 06:30:42 +00:00
Motomu Utsumi
0e9c379c3e Enable java bpf map always in U devices
Having SdkLevel.isAtLeastU() as a default value of
DeviceConfigUtils.isFeatureEnabled could result confusing behavior.
For example, when flag value is pushed to only the T device and the T
device with the flag is ugraded to U, this device could disable java bpf
map while the device keeps the flag value.
This CL prevents above confusing behavior.

Bug: 246218229
Test: atest BpfNetMaps
Change-Id: I615603c337bb94101dccac77ea0e6fa857041259
2022-12-06 15:03:20 +09:00
Thiébaud Weksteen
b865214380 Merge "Relocate NetworkManagementServiceTest to framework" 2022-12-06 05:57:00 +00:00
KH Shi
87d984b0e4 Merge "Fix ConntrackSocketTest#testIpv4ConntrackSocket flaky" am: cc8db2ac6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2264961

Change-Id: Ie3cf3200769616888383d71b0bfbd76c621637e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 05:53:44 +00:00
Paul Hu
29522fa52a Merge "Fix empty value problem in the TextEntry" am: ed3e683407
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2273087

Change-Id: Ic7312cf85607082caaf7e8f052b1dcf52c63ae38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 05:53:22 +00:00
KH Shi
cc8db2ac6e Merge "Fix ConntrackSocketTest#testIpv4ConntrackSocket flaky" 2022-12-06 05:46:54 +00:00
Paul Hu
ed3e683407 Merge "Fix empty value problem in the TextEntry" 2022-12-06 05:31:39 +00:00
Nucca Chen
3be769a343 Merge "Test: separate common methods to EthernetTetheringTestBase" am: a43bba1277
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2319210

Change-Id: If094c40e9fb2fa1318ca3c7af89fcdad2ba480a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 03:23:15 +00:00
Nucca Chen
a43bba1277 Merge "Test: separate common methods to EthernetTetheringTestBase" 2022-12-06 02:30:13 +00:00
Bill Yi
84350e2872 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:53:06 +00:00
Bill Yi
7da3726b05 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:53:06 +00:00
Chidera Olibie
c41b5250db Merge "cronet: rename cronetApiTest" am: 59d52bbb80
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2320155

Change-Id: I903d3485366d5f62b2ab85cf489d5b133b66ccb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 18:52:41 +00:00
Chidera Olibie
59d52bbb80 Merge "cronet: rename cronetApiTest" 2022-12-05 18:03:24 +00:00
Aaron Huang
eed405a3cf Merge "Fix cell stats did not increase due to rate limit in battery stats" am: 1131ec74db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2316965

Change-Id: Ib5b517f6b85e24bf8ae37a28898cd80e52dfd8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 15:13:55 +00:00
Aaron Huang
aa1826207a Fix cell stats did not increase due to rate limit in battery stats
Current test triggers batterystats to update mobile stats by
switching default network and ConnectivityService will call
reportMobileRadioPowerState to have batterystats update the
mobile stats. But in current design, batterystats will
rate-limit the update if it is due to modem power state change.
So the modem stats might not be updated if it's rate-limited.
The other reasons (plug/unplug, battery level change,etc) will
be unaffected. Thus, dump battery stats in the test to trigger
a full sync of data.

Bug: 256087047
Test: CtsNetTestCases:BatteryStatsManagerTest
Change-Id: I936d51f0c205640eac94f80062ad66f55df9d0df
(cherry picked from commit 3c4231d613)
Merged-In: I936d51f0c205640eac94f80062ad66f55df9d0df
2022-12-05 14:46:44 +00:00
Aaron Huang
1131ec74db Merge "Fix cell stats did not increase due to rate limit in battery stats" 2022-12-05 14:45:08 +00:00
Chidera Olibie
a888443870 Merge "cronet: remove inner TestUrlRequestCallback class" am: 126721cdf4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2317225

Change-Id: Ie7f4a7479f80f1824cf933ada5bcfaef5b8f545b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 14:36:38 +00:00
KH Shi
09eb7631fa Fix ConntrackSocketTest#testIpv4ConntrackSocket flaky
If we run an iterations test, TCP connections opened by previous tests
won't be closed immediately. They will stay in the TIME_WAIT state for
120 seconds before closed. Netfilter socket listens to both
NF_NETLINK_CONNTRACK_NEW and NF_NETLINK_CONNTRACK_DESTROY groups.

There is a tiny time gap between socket creation and sending dump
request to kernel. If an old TCP connection happened to be closed in
this time gap, listening socket would see a DESTROY message before
seeing the NEW messages triggered by dump request.

The current test only parsing the first contrack message in the read
buffer, so it will only find the DESTROY message and ignore all of the
following NEW messages. It does a netfilter socket dump, but does not
check whether the dump produces reasonable output. Now that we have
the ability to parse conntrack messages, do more in-depth checking.

Bug: 254608655
Test: atest ConntrackSocketTest --iteration 500
Change-Id: Icf95adb9d9390d598e9c6bdb4e245c5fce764e3e
2022-12-05 22:26:52 +08:00
Chidera Olibie
e2cc572bad cronet: rename cronetApiTest
Change the name to reflect the cronet class that is being tested

Test: atest CronetApiTest
Bug: 251012627
Change-Id: I8b9c6421393582b57043a140b400f6a1e8ace601
2022-12-05 14:21:24 +00:00
Chidera Olibie
126721cdf4 Merge "cronet: remove inner TestUrlRequestCallback class" 2022-12-05 14:05:32 +00:00
Motomu Utsumi
4567aaaddb gn2bp: Add .aidl files to the srcs of java_library am: 6e51412de6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327499

Change-Id: Ibacbac6529ec95e9c7b28e7841870911c8d57af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:25:01 +00:00
Motomu Utsumi
aee813acc6 gn2bp: Add _sanitize_args to WriteNativeLibrariesJavaSanitizer am: 3dbc2766a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327498

Change-Id: Ife2c62f4ae5e89079ee0b4b6cfadfc9ccb9e78ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:59 +00:00
Motomu Utsumi
f94a1f2b6d gn2bp: Add WriteNativeLibrariesJavaSanitizer am: b90a76b0cb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327497

Change-Id: I11aebb9bae22e1195b0359c0b11f7d602b9d9283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:57 +00:00
Motomu Utsumi
58c4a3fecf gn2bp: Add _sanitize_args to JavaCppStringSanitizer am: 3f7ab3147e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327496

Change-Id: Ibab30157d5b1a17c1a0d81e9968e0664b7efa8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:55 +00:00
Motomu Utsumi
80e1229eda gn2bp: Add JavaCppStringSanitizer am: ce5166bb67
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327495

Change-Id: I6cdf62e5faaf7acb2afa66044d58ef257dd6f536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:53 +00:00
Motomu Utsumi
2e327a322f gn2bp: Add _sanitize_args to JavaCppFeatureSanitier am: d7c3677794
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327494

Change-Id: I8b0c473b8b0ec71b48cf83606869df2d6c8d718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:51 +00:00
Motomu Utsumi
dae2bc6c84 gn2bp: Add JavaCppFeatureSanitizer am: 56a2f44408
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327493

Change-Id: I4f439d38064529e01de08429668558c198050ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:49 +00:00
Motomu Utsumi
059fd06420 gn2bp: Remove unrequired hack for jni_registration_generator deps am: 47fd40a6a5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327492

Change-Id: I84a1c411dda798cd48324ce608e7995999aaeaf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 13:24:47 +00:00