Commit Graph

1115 Commits

Author SHA1 Message Date
chiachangwang
df347448a1 Make a v4 nattKeepalivePacket helper method
This is a preparation change for the subsequent changes to
separate the logic for constructing a v4 NAT-T keepalive
packets to a dedicated method.

Bug: 196453719
Test: atest FrameworksNetTests
Change-Id: If72b4875e65a547bbf90367eacce7b145358006a
2023-06-07 02:05:10 +00:00
Jean Chalard
78efbdcad1 Merge "Fix a bug where the PAC proxy port is not set correctly." am: f2b38772ac am: 19fec43662 am: 9a0b1f2653
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729153

Change-Id: I1612e3a0360961267264c80ecff16ec49e75f33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:23:47 +00:00
Aaron Huang
9fe47bee09 Fix a bug where the PAC proxy port is not set correctly.
Test: new test for this behavior in the preliminary change
Test: FrameworksNetTests NetworkStackTests
Fixes: 138810051
Fixes: 140610528
Change-Id: I95a979d232fb60ece2e33e972bf5d66d20357a1f
2023-06-05 20:24:59 +09:00
Chiachang Wang
bfe3e5f09f Merge "DO not throw exception for ERROR_NO_SUCH_SLOT error" am: 95336cf4fc am: d57116437b am: 603226c26c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593906

Change-Id: I1c7eda50caca646220770b41a4e3118f6fb7521b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:07:08 +00:00
Chiachang Wang
95336cf4fc Merge "DO not throw exception for ERROR_NO_SUCH_SLOT error" 2023-05-23 07:13:52 +00:00
Treehugger Robot
23b5cfc7b9 Merge "Improve doc for CSM#setGlobalProxy" am: b92d8ccd39 am: 4602fea1d7 am: a93c6bc35b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535862

Change-Id: I4b47ed572869e29d9bde626736dd72d36d11cd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 06:18:46 +00:00
chiachangwang
75673ba502 DO not throw exception for ERROR_NO_SUCH_SLOT error
There are multiple independent reasons a keepalive can stop. Some
are software (e.g. the app stops the keepalive) and some are hardware
(e.g. the SIM card gets removed). Therefore, there is a very low
probability that both of these happen at the same time, which would
result in the first stop attempt returning SUCCESS and the second
stop attempt returning NO_SUCH_SLOT. Such a race condition can be
ignored with a log, not to crash the system. Change to wtf log so
that the issue could still be visible since this implies possible
bugs in the system.

Also update the javadoc for SocketKeepalive.ERROR_NO_SUCH_SLOT.

Bug: 281484381
Test: atest FrameworksNetTests
Change-Id: I316a2193fc7302b04e074ff0b03dc43946fe5ce6
2023-05-23 05:08:45 +00:00
Treehugger Robot
b92d8ccd39 Merge "Improve doc for CSM#setGlobalProxy" 2023-05-23 04:04:45 +00:00
Treehugger Robot
73382087f7 Merge "LinkProperties: use ordered comparison for P-CSCFs - only on U+" am: 78e158f2bb am: 9135b92758 am: 2d613cdfae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2596485

Change-Id: I05115f338e749f7aecab2e2feea6fa9a611c9165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 07:27:11 +00:00
Maciej Żenczykowski
f7939fa8d1 LinkProperties: use ordered comparison for P-CSCFs - only on U+
to make sure a mainline update doesn't break devices in the field

Test: TreeHugger
Bug: 268479036
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iadcd861509d31b3ed6352d452a159cd89af479dd
2023-05-18 05:57:51 +00:00
Motomu Utsumi
dfa632c82a Merge "Fix agents disconnecting in SUSPENDED state." am: ec4511c8aa am: e3b728f350 am: 2f427efa76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2583410

Change-Id: I19069133f3fc54c652cc41cc2a3a9b5ffdf0afc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 03:52:31 +00:00
Motomu Utsumi
ec4511c8aa Merge "Fix agents disconnecting in SUSPENDED state." 2023-05-17 01:59:18 +00:00
wangshengrjxtjcb
fd5d3d90e1 Fix agents disconnecting in SUSPENDED state.
Network state is not changed to disconnected when a networkagent
is disconnected and network state is SUSPENDED.

So the function requiresClat return true. Clat is not stoped.

Bug: 277682237
Test: atest FrameworksNetTests

Change-Id: I5edfcf64aca5d2d34325d722dd29fab41bcf2600
2023-05-16 16:35:03 +09:00
Maciej Żenczykowski
ca93b277a8 Merge "LinkProperties: use ordered comparison for P-CSCFs." am: 7428de995b am: 9a53283d62 am: 1216106e15
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2580731

Change-Id: I20056e70c719ffb8533b750237a32a93b348e3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 19:42:42 +00:00
Maciej Żenczykowski
7428de995b Merge "LinkProperties: use ordered comparison for P-CSCFs." 2023-05-15 17:32:01 +00:00
Patrick Rohr
3b5a398a96 Merge changes from topic "delete-cronet-disabled-support" am: f128ba3461 am: 8edcdc1e82 am: a5b0af14a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2585017

Change-Id: If7c086fec1c55b2e9d831bafe6808bd92c545a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 06:28:44 +00:00
Patrick Rohr
740b1d4ac3 cronet: Move cronet defaults to framework/Android.bp
Since cronet has moved out of the tethering jar.

Test: TH
Change-Id: Ibf476c0afd72863b26188dae6838825e6762976a
2023-05-12 10:15:01 -07:00
Maciej Żenczykowski
b0fc6627a6 LinkProperties: use ordered comparison for P-CSCFs.
P-CSCF list is ordered list. Two lists with same servers but
in different order are not equal. Use proper comparison.

The P-CSCF address is a kind of entry point (proxy) of Server
for IMS transaction between device and IMS Server.  It can have
multiple addresses as a list. Even if the same addresses have
different orders, it is assumed that the server order has changed.

Bug: 268479036
Test: TreeHugger
Change-Id: Ia1884f37739a20d871dd0024cc72cb18c083dc8e
2023-05-07 13:14:15 +00:00
Treehugger Robot
f8002754fe Merge "Expose internal representation of transport types." am: c745e52e04 am: 246958a796 am: cedcc69717
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2567453

Change-Id: I40c6e5ecae90ff2e969f2506660108a410e334f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:25:04 +00:00
Treehugger Robot
c745e52e04 Merge "Expose internal representation of transport types." 2023-05-02 06:43:07 +00:00
Motomu Utsumi
ddc0e449f0 Merge "Move ConnectivityResources to service-connectivity" am: a746ab1d68 am: a11a47b70f am: d8e8c72984
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2446025

Change-Id: Ie6185306ab1b3f30ad69fd952513e9899be18d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 22:59:06 +00:00
Remi NGUYEN VAN
bee2ee14f3 Move ConnectivityResources to service-connectivity
The ConnectivityResources class is only usable with QUERY_ALL_PACKAGES
permission, so it is not generally usable in framework-connectivity. It
is also backed by the ServiceConnectivityResources APK, which is
intended as resources for service-connectivity.

Move the class to service-connectivity and update callers. CTS needs a
way to determine the supported keepalive count as it used the
resources from KeepaliveUtils as @hide API, so provide a
ConnectivityManager @hide API for testing.

Bug: 279108992
Test: atest
Change-Id: I3c9a77c580b5ab87c922c32778bce15dc33b4d1d
2023-04-28 19:18:39 +09:00
Hansen Kurli
13189e957d Expose internal representation of transport types.
Add getTransportTypesInternal as a hidden api for internal callers. This
will be used for any metrics that need to store the transport types of a
network.

Bug: 273451360
Test: atest FrameworksNetTests
Change-Id: I527638e5408e7971a450135345e7e51b6125d665
2023-04-26 13:09:35 +00:00
Treehugger Robot
7f7ce481f9 Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1 am: 0d3d27ecc1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2384592

Change-Id: I42ea6b11578823dd3adf7768edee98c992127e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 19:54:54 +00:00
Treehugger Robot
0d3d27ecc1 Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2384592

Change-Id: Id8d9a686e729b920826f0b6e205f770768585925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 18:32:02 +00:00
Treehugger Robot
fd402476f1 Merge changes I33bc80cc,Ie84e2cd4
* changes:
  EthernetManagerTest: update tests that bring up tap without carrier
  TestNetworkService: use IFF_NO_CARRIER to bring up iface without carrier
2023-04-20 18:01:28 +00:00
Maciej Żenczykowski
da7b9a60b0 Merge "switch to classic bpf macros" am: ea07e4dff2 am: ef5a6afcd8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2480336

Change-Id: Id81641723a3b2109cb63702d06ce3b41e1846e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 20:34:37 +00:00
Maciej Żenczykowski
ef5a6afcd8 Merge "switch to classic bpf macros" am: ea07e4dff2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2480336

Change-Id: Ic1f267f32710e2dc31249b0b2b1222577cb8b43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 19:48:49 +00:00
Maciej Żenczykowski
ea07e4dff2 Merge "switch to classic bpf macros" 2023-04-19 19:37:02 +00:00
Motomu Utsumi
43007b14df Merge "Move cronet to framework-connectivity" am: 8b02a2682a am: ceb9f59803
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535863

Change-Id: I42bfc86f2f004faddf8ce71ace0ce7c3feb1c895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 07:32:33 +00:00
Motomu Utsumi
ceb9f59803 Merge "Move cronet to framework-connectivity" am: 8b02a2682a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535863

Change-Id: I0d22e595a4df67e3cf7c4300714b8e6bf736703d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:47:45 +00:00
Motomu Utsumi
73e2e87d56 Move cronet to framework-connectivity
aosp/2384137 added cronet to framework-tethering.
But framework-connectivity is a better place to put cronet since
cronet does not work on R devices (b/270049141) and
framework-tethering is R+, framework-connectivity is S+.

Followup CLs will move some modules (e.g. CronetJavaPrejarjarDefaults)
that use the branch dependent soong variables to framework/Android.bp

Test: TH
Bug: 278070640
Change-Id: I6bc10116759fb9e083c02147908e53022dab740a
2023-04-19 11:32:12 +09:00
Maciej Żenczykowski
32b46a4d36 switch to classic bpf macros
Note: this switches
  com_android_networkstack_tethering_util_setupIcmpFilter
over to relative cbpf which in turn is called from:
  com_android_networkstack_tethering_util_setupNaSocket
  com_android_networkstack_tethering_util_setupNsSocket
and tested by p/m/C's:
  TetheringUtilsTest.java - testIcmpSocketFilters()

Test: TreeHugger, atest TetheringUtilsTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I22a5ea8f8e3b879a37fe4acd84f61020661eaa71
2023-04-19 00:06:15 +00:00
Chiachang Wang
cfdedd1d02 Merge "Separate events usage for starting socket keepalives" am: 2cf6b2c4fd am: 56a01b57e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535341

Change-Id: Ifbcefecfb70076edeffd115a4d465821e3a58e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 02:54:47 +00:00
Chiachang Wang
56a01b57e4 Merge "Separate events usage for starting socket keepalives" am: 2cf6b2c4fd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535341

Change-Id: Ifa574e6fa845967d1c389fc9a825418d0993e9a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 02:41:27 +00:00
Chiachang Wang
2cf6b2c4fd Merge "Separate events usage for starting socket keepalives" 2023-04-17 02:32:00 +00:00
Yuyang Huang
97caf8ea9f Merge "Handle downstream tethering interface addresses in MdnsSocketProvider" am: 885854c9ee am: 2215730e12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2490879

Change-Id: Ifc04af1999382fa03379e65c752462d85f22d44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-16 02:02:57 +00:00
Yuyang Huang
2215730e12 Merge "Handle downstream tethering interface addresses in MdnsSocketProvider" am: 885854c9ee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2490879

Change-Id: I1052d86478a5caf947369c7ca1bc14e2d065a966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-16 01:32:49 +00:00
Yuyang Huang
700778be70 Handle downstream tethering interface addresses in MdnsSocketProvider
MdnsSocketProvider currently does not fill addresses of downstream
tethering interfaces in its callbacks. The interface addresses should be
properly updated by listening to the Netlink messages.

Test: atest FrameworksNetTests CtsNetTestCases
Bug: 267980538
Change-Id: I753e547a1b092703fe59c6c9e922ee8aca245f67
2023-04-15 21:55:51 +09:00
chiachangwang
f1b1fb4b7f Separate events usage for starting socket keepalives
This is a clean up commit to correct the javadoc of
NetworkAgent.CMD_START_SOCKET_KEEPALIVE. This event was used
between ConnectivityService/NetworkAgent, and also
ConnectivityService/KeepaliveTracker with different semantics.
This may confuse the developers to update the doc incorrectly,
so also separate the usage to different events.

Also move the event definitions together so that a new event
definition will not mis-use the existing values.

Test: atest FrameworksNetTests
Change-Id: I73ebd8abcc610531da3057da2d643a41befb2099
2023-04-14 07:43:56 +00:00
Chalard Jean
c8ef219c26 Improve doc for CSM#setGlobalProxy
Test: comment-only change
Change-Id: I597d2ae8297159202ed52daa2f96e792b6623040
2023-04-14 14:47:00 +09:00
Yan Yan
e5aed4c51e Merge "Retain subscription IDs on restricted test networks" am: 51db40f5e5 am: 5aed3bff05 am: 860598a6a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2506442

Change-Id: I9e49ad24c24f30496945297ca3b7349ff40eac1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 05:04:41 +00:00
Yan Yan
815cedfcbb Merge "Retain subscription IDs on restricted test networks" am: 51db40f5e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2506442

Change-Id: Ia0a32684c36081d8ad364b5105a8829480e35c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 04:16:22 +00:00
Yan Yan
9064ee95de Merge "Add allowed capabilities on non cellular test networks" am: d71f6efa89 am: 63df2d1b66 am: e607e8a4e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2470461

Change-Id: I2dba5901aca1ff4283c7d1e122d258aa692dca5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:13:17 +00:00
Yan Yan
ad3e1f3b08 Merge "Add allowed capabilities on non cellular test networks" am: d71f6efa89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2470461

Change-Id: I35f2fa55c34628cae9cd6556497b0d385c24339e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:23:18 +00:00
Yan Yan
966fb798a1 Retain subscription IDs on restricted test networks
Fix the bug where subscription IDs will be cleared
on a restricted test network

Bug: 263415068
Test: NetworkCapabilitiesTest
Change-Id: I977781cd81f9d86858bd264825d66a2a69f6ce53
2023-03-30 07:49:13 +00:00
Yan Yan
acd71e68a6 Add allowed capabilities on non cellular test networks
This commit expands the allowed capabilities of non cellular test
networks to include another three values, so that CTS can verify
features that do network selection based on those capabilities.

It is relatively safe becuase for apps that request TRANSPORT_CELLULAR
and the affected capabilities, test networks will still not become their
default networks.

Bug: 263415068
Test: atest NetworkCapabilitiesTest(new tests)
Change-Id: I2e348e4722ecdaa6e277fe77968916ffa2f16af9
2023-03-22 18:27:19 -07:00
Paul Hu
5c28b172f7 Merge "Add a CompatChange flag to enable platform backend" am: 62503cfef1 am: fa2a4f33d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452427

Change-Id: I8211177f9cef3b2a36ab5e00a34d77346693e5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:24:13 +00:00
Paul Hu
fa2a4f33d9 Merge "Add a CompatChange flag to enable platform backend" am: 62503cfef1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452427

Change-Id: I9591abf64328d91a470bccb9816ad19bf09672f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 13:49:09 +00:00
Paul Hu
62503cfef1 Merge "Add a CompatChange flag to enable platform backend" 2023-03-17 13:14:19 +00:00