Commit Graph

84942 Commits

Author SHA1 Message Date
Mark
4845823f48 Move buildXXXPacket methods into TetheringTester
Move all EthernetTetheringTest buildXXXPacket util into TetheringTester
and make them static public.

Bug: 259888307
Test: atest EthernetTetheringTest
Change-Id: Ice5252c1adfdb98dfaf815f48ac4603711317f65
2023-06-22 07:12:49 +00:00
Chalard Jean
e13b833b21 Allow firing the LOST_INTERNET intent immediately in config
When config_notifyNoInternetAsDialogWhenHighPriority is on, the
LOST_INTERNET notification intent should be fired immediately
rather than as a pending intent.

Bug: 281970908
Test: Improve test for this in NetworkNotificationManagerTest
Change-Id: I88565839a12a1ab4b096f763250944ebaf6c5349
2023-06-22 15:03:10 +09:00
Remi NGUYEN VAN
8561dc558d Replace connectToWifi with ensureWifiConnected am: 0828c6e0f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632990

Change-Id: Ie118e67239d2622143e9a2870290792f5ca2e551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 03:54:59 +00:00
Remi NGUYEN VAN
0828c6e0f2 Replace connectToWifi with ensureWifiConnected
connectToWifi expects a CONNECTIVITY_ACTION broadcast, which
may not be received if wifi is already connected.

There is already a separate test exercising the broadcast,
testToggleWifiConnectivityAction.

Bug: 283272115
Change-Id: I21a358fcb119878969eb898e15fea9da1af9a108
Test: TH
2023-06-22 01:42:47 +00:00
Paul Hu
7652bf35f3 Merge "Fix flaky test: testMobileDataPreferredUids" am: b063daea6d am: 04768129ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624375

Change-Id: I0f5aaaa1c5f5841d3b17db1f87784fdb1328204c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:57:28 +00:00
Motomu Utsumi
c561423cbb Merge "Skip testDefaultNetworkActiveListener on R devices." am: 3d153f9a89 am: 3a1e5d1a0f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624371

Change-Id: I0b0686c9f380e9c339bc980882247daa8a5d493f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:44:35 +00:00
Abdelrahman Ibrahim
0914d38b1a Merge "Guard the usage of PacProxyManager when it is not supported by the device." am: 76f61bb2e8 am: 89c7b7db4e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2623371

Change-Id: I7edaa846d668a785cd3d3e7dcc6729c8c58048b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:44:24 +00:00
Hansen Kurli
4e12d109bc Merge "follow up aosp/2600007" am: dc8df135cb am: 957d205a59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2628993

Change-Id: Icf55b43639930a341ecc0a5f9070775823fc46b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:44:10 +00:00
Motomu Utsumi
62fe503b82 Merge "Fixes isDefaultNetworkActive and onNetworkActive unreasonable behavior" am: e0365d45ca am: dd0653ee79
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605757

Change-Id: Iee2e73e2719e3b609bed6b99e6f2d1e61a0d8c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:43:58 +00:00
Motomu Utsumi
bc8214a989 Merge "Remove locks from LegacyNetworkActivityTracker" am: d66e846764 am: 7dd8c0ead3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606669

Change-Id: Ic292765e15b7df0be5be6261ddad6a062cf0025c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:43:47 +00:00
Motomu Utsumi
26d96cd828 Merge "Add executing thread check in LegacyNetworkActivityTracker" am: 48d4e66542 am: c34a1628ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605754

Change-Id: I6290f56c1871760e0850abce148e5c0344769e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:43:36 +00:00
Motomu Utsumi
26c602cded Merge "Add idleTimer existence check before removing idleTimer" am: 40177cf4cb am: 204765e5e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605753

Change-Id: I22e211f44fb50f5f4c978b6b2b36fd00ef2e8033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:43:25 +00:00
Motomu Utsumi
53c70e5a96 Merge "Move network activity change processing to handler thread" am: df9a2d7e20 am: b3f309ca24
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606673

Change-Id: I6e6e8c3232e5c33b5b2abe66361ded32560283bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:43:14 +00:00
Motomu Utsumi
852b0ecf6d Merge "Add test for default network activity APIs" am: 0d56157186 am: d41a3fc42d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2573990

Change-Id: I7a53f4e32c0f5de91216f3a68523de01af9ba163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:43:02 +00:00
Mark Chien
e204f8e2c3 Merge "Tethering: ignore duplicate upstream changed event" am: c2e434bbc7 am: cedb8d1153
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2390555

Change-Id: I3a8e4beb00fb7028bd93394872cee508dd85473d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:42:51 +00:00
Cassie Wang
7fdd855fdd Merge "Add checks around CONTROL_VPN permission during prepare()" am: 04f3dc871d am: e9c82f087a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624812

Change-Id: I622949663c57e00fd9a41f7c5cc088e6679726c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:42:39 +00:00
Hansen Kurli
d5fda2b58b Merge "Have paused keepalives keep their hardware slot" am: 95386feff1 am: e82e214570
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2600007

Change-Id: I887d27500c3b295bfff8f7a0c2b8d16b8d3cb213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:42:25 +00:00
Mark Chien
92d657c50e Merge "Diable ConnectivityManagerTest#testFactoryReset" am: 8c59e582a5 am: 849fcba7ae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629809

Change-Id: I22dc8dde4535fdc8fdeb247011d15e5b65905a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:42:14 +00:00
chiachangwang
42f028d46f Correct the namespace of DeviceConfig in VpnTest am: d64b2b1bdd am: e8889a4589
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629811

Change-Id: Ie323a3ce2b6ce7609dcfe3b8f677a097bffd8168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:42:01 +00:00
Chiachang Wang
a35f967dc6 Merge changes I9bbff5be,I270b751d,Ibf1bd267 am: fbcd08a28d am: f094ab6db5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624380

Change-Id: I6f769224286b75f99f04d1b29e800ad5d0f27dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:41:51 +00:00
Maciej Żenczykowski
3f8b5a4486 Merge "ProcNetTest: print proc path on assertion failure" am: b2ff76cdbd am: 2167926799
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629250

Change-Id: I42f63f26ff27ce2f53d31cdadbae2b17b8543120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:41:40 +00:00
Mark Chien
0f5c0681cb Merge "Add testIpv4AddressForSapAndLohsConcurrency test case" am: f4ef96c62f am: bf971ae11c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2561990

Change-Id: Ia7c5d19d1585c1c28b59332915da5b9a69413ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:41:29 +00:00
Treehugger Robot
73d44ac99c Merge "Adds option to control whethert to send IPv6 packet on IPv6 only network" am: 454c06e956 am: 882e74b042
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2613049

Change-Id: I7c0ed3294e122ca24dc0279792209ac344313dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:41:18 +00:00
Mark Chien
81b18676b9 Merge "Add testConnectedClientsForSapAndLohsConcurrency test case" am: c23fb4f1ea am: 22dbc50afd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2561930

Change-Id: Id38ae3330615c8557b67684e3f61d05f3c95b0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:41:06 +00:00
Maciej Żenczykowski
1e06a961c8 Merge "Connectivity: bump min sdk 29(Q) to 30(R)" am: 5cee77a0ec am: 1cc92b4003
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2601485

Change-Id: I8cdc4bdc0d8160ef09889bc4d836d8a3b2edfc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:40:55 +00:00
Maciej Żenczykowski
d4f8b228fe Merge "Remove toString test." am: 12540e13f0 am: a59d1177b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2612137

Change-Id: I2382bc0613f387b1b405c02f3ad942805aefa921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:40:44 +00:00
Maciej Żenczykowski
efc35c5a72 Merge "bpf_progs: disable BTF on <=U && user builds" am: c95835d175 am: 66adebaf36
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2619076

Change-Id: I52e651f20fb67f61383542f7ca14a7587982859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:40:31 +00:00
Treehugger Robot
e82b06b1e4 Merge "ethernet: delete superfluous helper function" am: a6f0bf9c93 am: 2799284222
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2626729

Change-Id: I80c36c5636034b73db64562327e0135a8dc0ab3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:40:20 +00:00
Chiachang Wang
1d8792e48e Merge "Fix flaky test in NattKeepalivePacketDataTest" am: d4894956b6 am: 3b6f775cd5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2626270

Change-Id: Ibc20f73ae63c371f9eac022ae0109d2b114315f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:40:09 +00:00
Lorenzo Colitti
9e23d4d762 Merge "Always disconnect agents immediately." am: d925df8aa6 am: a89d79e3c7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2623893

Change-Id: I5b9fbb4ceb2c931c262d30180de40e842ff24594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:39:58 +00:00
Treehugger Robot
19552db722 Merge "Correct typo variable" am: cc3f9888e3 am: bb12305beb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2626269

Change-Id: Ic8e8bb79ba7fe2ac652af90ba9746a16e95a4033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:39:47 +00:00
Paul Hu
1a9eea3d66 Merge "Create an MdnsServiceTypeClient using a SocketKey" am: 7c60aaa851 am: 2a63cba7ee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593907

Change-Id: I65702d027eb92ace0b7dfe4631b916ff04e696ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:39:36 +00:00
Paul Hu
b3e2638d25 Merge "Notify socket changes using a SoketKey" am: a8d1cabcd7 am: f027f74e19
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2596565

Change-Id: I558487452d25f86bed10ef86180fdd6aaf78755a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:39:25 +00:00
Maciej Żenczykowski
4fdf3e4a50 Merge "Add uid to the failure log of testFirewallBlocking" am: b93f1e7486 am: 0be6d8bf3b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624382

Change-Id: Ie9727c7a16648d4133299e566a4e916e72d5319b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:39:13 +00:00
Treehugger Robot
4e1be09696 Merge "Improve logging and shutdown executor properly" am: a87b6027fb am: 499f62be12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624811

Change-Id: I56291090cd07f127de9387f719ac9ff1e4ccb465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:39:02 +00:00
Maciej Żenczykowski
9f1f08b5a7 use unique_fd !ok() instead of == -1 am: 2582445ec7 am: 1c5387153a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2625629

Change-Id: Iafd7fda268c8b9fe2f1a4955b3ed7f9f38cae289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:38:50 +00:00
Yuyang Huang
3f06b680f5 Merge "Revert "Importing the following changes from gmscore"" am: 018758595d am: d9b19e5e17
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624810

Change-Id: I019cd1c12ef28346f7e9d7e3d6777a931d0cb37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:38:39 +00:00
Yuyang Huang
bf5d5b5de8 Merge "Importing the following changes from gmscore" am: 049263eb74 am: 0b6ee98cb8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2620913

Change-Id: I95e2dc14cca736b175c04e20b7f8155fa9d281d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:38:27 +00:00
Paul Hu
fbd340f5d5 Merge "Add connectivity pre-check for net permission cts tests" am: 24c29ac6a5 am: 9a05f19583
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2564450

Change-Id: I78cc65600d0846c894a9ad4633375a55f8bc9c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:38:11 +00:00
Maciej Żenczykowski
548f03c749 Merge "Add helper method to generate a v6 NAT-T keepalive packet" am: 977fa60f5d am: 08dd67bf4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2616796

Change-Id: I35e2c052cc63e465e71aef5f38e680503b16b1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:38:00 +00:00
Yan Yan
df3e179a74 [automerger skipped] Merge "Update VPN tests to mock out createAttributionContext" am: 4f68ecf4ed am: e6b17965e2 -s ours
am skip reason: Merged-In I4228a7fb308b8d01aee53f0734f4c5753908473a with SHA-1 8e9f045d8d is already in history

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

Change-Id: I5f22b535c170ef3feed806a1a5f7985f4ec71156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:37:49 +00:00
Remi NGUYEN VAN
c5e26ed6e0 Increase socket timeout to 10s am: 1191ee2df9 am: 9fcbd8f9ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624092

Change-Id: I6c0404f5722d6a1bce1c006064f2fff7a6a80cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:37:20 +00:00
Hansen Kurli
8092b2adf2 Merge changes I3a38af76,I5e21de05 am: b261573ab0 am: a744a98272
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618634

Change-Id: I4c38129a7d09889fc0f8fac0ea7ad2ea8b57946a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:37:07 +00:00
Treehugger Robot
aac1da1dcd Merge "Test: Don't let MultinetworkApiTest throw more than one JNI exception" am: 2f2ae4ef33 am: 6c81fd8810
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2591305

Change-Id: I69b959c709d86f82c862723b200f2e2a8b79041e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:36:54 +00:00
Hansen Kurli
548da2a141 Replace upTimeMillis with elapsedRealTime am: d5ca3f1f69 am: 855db64343
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2620149

Change-Id: Ice685938720ecccd77503cca4e7008a16e293e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:36:42 +00:00
Hansen Kurli
3c06dfc77f Fill the other values for DailyKeepaliveInfoReported am: 91adc204d8 am: 2e22a13033
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2584342

Change-Id: If59f2af1f77758352cc2928a412c99728381aa2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:36:31 +00:00
Hansen Kurli
002e6a0f55 Register OnSubscriptionsChangedListener and cache results. am: c48d856976 am: 5032cbef52
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2547390

Change-Id: If24b4a77c1ae359bf213ead2cec06574e8fd09b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:36:19 +00:00
Hansen Kurli
aa36baa02f Track and build KeepaliveLifetimePerCarrier. am: ad03b887e6 am: ad8dc338a3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2530780

Change-Id: I29afbb8771de6020036a5980e35a52c8b92ec3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:36:08 +00:00
Treehugger Robot
29c34b8fa4 Merge "SuppressLint for use of TIOCOUTQ constant." am: c17aee3117 am: 6db324439f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2620253

Change-Id: I8d1dc738ca29b45c31d1fac8ad60528203b40fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:35:56 +00:00
Treehugger Robot
88a04b6c43 Merge "Use assertFailsWith to verify exception cases" am: f9e014317e am: 03726fb657
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618635

Change-Id: I489a3d4140efdaae0e938d44028eb9a904709ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 21:35:34 +00:00