Make NetworkAgent#sendNetworkInfo public again
...
Changing this method to private broke OEM code that would link
directly against the non-public methods of the module. This
should not be allowed, and we have changes in the works to
disallow this, but in the mean time we can't afford to break
devices in the field.
Test: will have to see how it behaves in the lab on relevant devices
Flag: EXEMPT bugfix
Bug: 406489362
Change-Id: Ie6c1ebb04e49317fdda34ff3dd522cd9d4677556
Chalard Jean
commited 2025-03-28 18:09:13 +09:00
f7e102081d
Merge "Changing from EnabledAfter to Disabled for RESTRICT_LOCAL_NETWORK" into main
Sarup Dalwani
authored and
Android (Google) Code Review
commited 2025-03-27 06:46:52 -07:00
8590d2dfd9
Merge changes from topic "revert-3561690-revert-3538339-SNUWWZJNJZ-BUWEOGUTIT" into main am: 2519a78731
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3563843
Change-Id: I71adf8e70b37b93378041ca17bb3d20c8f871cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-27 01:14:42 -07:00
480d443869
Merge changes from topic "revert-3561690-revert-3538339-SNUWWZJNJZ-BUWEOGUTIT" into main
...
* changes:
Add TargetApi annotation to ConnectivityService and QuicConnectionCloser
Revert "Revert "Remove unnecessary ifindex arg from destroyUdpSo..."
Revert "Revert "Add hidden API to register/unregister QUIC conne..."
Treehugger Robot
authored and
Gerrit Code Review
commited 2025-03-27 00:41:36 -07:00
2519a78731
Changing from EnabledAfter to Disabled for RESTRICT_LOCAL_NETWORK
...
The adb app compat command to enable fails for platform being old. Making this flag as disabled by default and overridable.
Bug: 405186661
Test: atest ConnectivityCoverageTests
Flag: EXEMPT bugfix
Change-Id: Ia1242803ed9b02290a5b66c4d1e224c87450d370
Sarup Dalwani
commited 2025-03-26 21:50:17 -07:00
65ce25496b
Add TargetApi annotation to ConnectivityService and QuicConnectionCloser
...
Test: TH
Change-Id: I5339b986d04462710ff9e9469050741f35ca4448
Motomu Utsumi
commited 2025-03-27 12:24:34 +09:00
8775fc7cf6
Merge "Fix transport override" into main am: c20c1224bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3561446
Change-Id: Iffdc456ce5d8e93611cef7154b48860721147514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Patrick Rohr
authored and
Automerger Merge Worker
commited 2025-03-26 19:38:19 -07:00
29b3dfebd0
Merge "Fix transport override" into main
Patrick Rohr
authored and
Gerrit Code Review
commited 2025-03-26 19:14:29 -07:00
c20c1224bc
Revert "Revert "Remove unnecessary ifindex arg from destroyUdpSo..."
...
Revert submission 3561690-revert-3538339-SNUWWZJNJZ
Reason for revert: NewAPI error will be fixed by separate CL
Reverted changes: /q/submissionid:3561690-revert-3538339-SNUWWZJNJZ
Change-Id: I2ae43c61c9ba0e0db3202a46e63756a3ea5a6512
Motomu Utsumi
commited 2025-03-27 08:49:10 +09:00
4d4563d62a
Revert "Revert "Add hidden API to register/unregister QUIC conne..."
...
Revert submission 3561690-revert-3538339-SNUWWZJNJZ
Reason for revert: NewAPI error will be fixed by separate CL
Reverted changes: /q/submissionid:3561690-revert-3538339-SNUWWZJNJZ
Change-Id: Ia7367e9332f4d376bd0be4c03c095ee00de9177a
Motomu Utsumi
commited 2025-03-27 08:49:00 +09:00
e8e28f6236
Merge changes Ia6685d88,I64008821,I03238c72 into main am: dd430a186c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3559524
Change-Id: Idcec5eaaffeb94c1e8658d4e7ff26e09d8fbd2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2025-03-26 16:14:45 -07:00
256be5a81b
Fix transport override
...
The EthernetConfigParser was adding the transportType on top of the
TRANSPORT_ETHERNET of DEFAULT_CAPABILITIES, causing multiple transport
types to be added.
This was causing an IllegalStateException when trying to set the
NetworkSpecifier within the EthernetNetworkFactory.
This only applies for when isAtLeastB && capabilitiesString.equals("*")
is true (as the parsed capability is equal to DEFAULT_CAPABILITIES).
Flag: TEST_ONLY
Bug: 405172885
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ethernet.EthernetTrackerTest
Change-Id: I6678a52ddc87b8ad66c602c68335f3e2073d7231
Chris Desir
authored and
Patrick Rohr
commited 2025-03-26 15:51:04 -07:00
65a26519c0
Merge changes Ia6685d88,I64008821,I03238c72 into main
...
* changes:
Store socket cookie to sk storage in inet_create hook on 5.10+ kernel
Declare map with BPF_MAP_TYPE_SK_STORAGE
Add macro to declare a sk storage and related accessor functions
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2025-03-26 15:36:06 -07:00
dd430a186c
Merge changes from topic "revert-3538339-SNUWWZJNJZ" into main am: 86961c4b73
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3561690
Change-Id: I8ad3379f937a13c11fe0574c4397a4e5823d777c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chaitanya Cheemala (xWF)
authored and
Automerger Merge Worker
commited 2025-03-26 04:08:27 -07:00
3d3b87b4f9
Merge changes from topic "revert-3538339-SNUWWZJNJZ" into main
...
* changes:
Revert "Add hidden API to register/unregister QUIC connection cl..."
Revert "Remove unnecessary ifindex arg from destroyUdpSocket"
Chaitanya Cheemala (xWF)
authored and
Gerrit Code Review
commited 2025-03-26 03:44:15 -07:00
86961c4b73
Merge changes I0eb70c12,I6cd727bd into main am: ebdcd9e199
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3538339
Change-Id: Iceb5c099835684c4014d1e05613d4200869b802e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-26 03:11:15 -07:00
fdb5ac536f
Revert "Add hidden API to register/unregister QUIC connection cl..."
...
Revert submission 3538339
Reason for revert: Likely culprit for b/406432012 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:3538339
Change-Id: I61b02f2b1b667e9a41b677f8062e8e96aac09f6e
Chaitanya Cheemala (xWF)
commited 2025-03-26 03:07:07 -07:00
947b53b0d3
Revert "Remove unnecessary ifindex arg from destroyUdpSocket"
...
Revert submission 3538339
Reason for revert: Likely culprit for b/406432012 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:3538339
Change-Id: I70395af68b0f28e5c333333cb03a42f7633b0d5d
Chaitanya Cheemala (xWF)
authored and
Gerrit Code Review
commited 2025-03-26 03:07:07 -07:00
68b852a69c
Merge changes I0eb70c12,I6cd727bd into main
...
* changes:
Remove unnecessary ifindex arg from destroyUdpSocket
Add hidden API to register/unregister QUIC connection close payload
Treehugger Robot
authored and
Gerrit Code Review
commited 2025-03-26 02:30:35 -07:00
ebdcd9e199
Remove unnecessary ifindex arg from destroyUdpSocket
...
Bug: 311792075
Test: m
Change-Id: I0eb70c1248aff347e6f988789f340e117fceea33
Motomu Utsumi
commited 2025-03-26 16:48:43 +09:00
58498d1eee
Add hidden API to register/unregister QUIC connection close payload
...
QUIC stack running on the app process will call this API and register
QUIC UDP socket and UDP payload that can close QUIC connection.
When the app loses network access (e.g. due to freezer or firewall
chain), ConnectivityService 1)destroys the registered UDP socket by
sending a SOCK_DESTROY netlink message and 2)sends the registered UDP
payload to the server. This prevents unnecessary modem wakeups caused
by packets from the server after the apps lose network access.
Additionally, to close QUIC connection for apps that crash or are
killed, ConnectivityService sends the registered UDP payload when it
receives a socket destroy diag message for the registered socket.
Bug: 311792075
Test: CSDestroySocketTest CtsNetTestCases
Change-Id: I6cd727bd8bb0fe1d17360edfa395f73d24da6920
Motomu Utsumi
commited 2025-03-26 16:48:28 +09:00
627b8c6d34
Merge "Address aosp/3541181 leftover comments" into main am: bd1703ff4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3555993
Change-Id: I5b6a7126ff771f27a7d74b48ae4eb947243138dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2025-03-25 22:25:41 -07:00
22ffcebc41
Merge "Address aosp/3541181 leftover comments" into main
Paul Hu
authored and
Gerrit Code Review
commited 2025-03-25 22:06:01 -07:00
bd1703ff4f
Store socket cookie to sk storage in inet_create hook on 5.10+ kernel
...
Test: adb logcat | grep inet_create on 4.19 and 5.10 kernel
Bug: 406080305
Change-Id: Ia6685d8827ea1570b950aff63bcae242e28ba637
Motomu Utsumi
commited 2025-03-26 09:25:37 +09:00
8fab64955b
Declare map with BPF_MAP_TYPE_SK_STORAGE
...
Test: adb logcat | grep sk_storage on 4.19 and 5.10 kernel
Bug: 406080305
Change-Id: I6400882146e8fd686a4260c5bf586a8f73032c71
Motomu Utsumi
commited 2025-03-26 09:25:37 +09:00
70793af736
Add macro to declare a sk storage and related accessor functions
...
Test: boot
Bug: 406080305
Change-Id: I03238c72e8024d4424c06803784988570513ff39
Motomu Utsumi
commited 2025-03-26 09:25:33 +09:00
d370f95f10
Merge "clatd bpf: drop multicast" into main am: b45a61bc3f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3560669
Change-Id: I38049824bee9a0de3f433b41883f265cbe800864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2025-03-25 15:56:47 -07:00
35187a62c8
Merge "Delete unused function" into main am: 45173f74d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3561187
Change-Id: Ibd7a9aa8b06ef21c175b5feb5a9a9a5d00b54392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Patrick Rohr
authored and
Automerger Merge Worker
commited 2025-03-25 15:56:25 -07:00
2b0899c009
Merge "clatd bpf: drop multicast" into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2025-03-25 15:39:25 -07:00
b45a61bc3f
Merge "Delete unused function" into main
Patrick Rohr
authored and
Gerrit Code Review
commited 2025-03-25 15:36:12 -07:00
45173f74d3
Merge "NetBpfLoad: allow 25Q3" into main am: 17312c082f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3560665
Change-Id: Ic4e47cfc3652f772c98f38ff4f12a251700434d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-25 15:12:26 -07:00
b9425d819e
Merge "NetBpfLoad: allow 25Q3" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2025-03-25 14:54:59 -07:00
17312c082f
clatd bpf: drop multicast
...
to avoid waking up clat daemon needlessly
(it just drops these anyway)
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8485f01635d5c6dd168d89279a3b390200f78c63
Maciej Żenczykowski
commited 2025-03-25 13:57:21 -07:00
aa33013ba5
Merge "Move static IpConfiguration parsing into EthernetConfigParser" into main am: 43e8226877
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3561186
Change-Id: If9462d4ae1d722f1e260cf3c555f34a67dab1dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-25 13:54:16 -07:00
66d75a648c
Merge "Move static IpConfiguration parsing into EthernetConfigParser" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2025-03-25 13:31:32 -07:00
43e8226877
NetBpfLoad: allow 25Q3
...
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com
Change-Id: Iced07b6438b4702334aaf85d301987efefe153c6
Maciej Żenczykowski
commited 2025-03-25 13:05:44 -07:00
3ac88f375b
Delete unused function
...
Test: TH
Change-Id: I1f81032ea14d87736e2c8890e9259f20aace4a0b
Patrick Rohr
commited 2025-03-25 11:56:41 -07:00
074c4934cd
Move static IpConfiguration parsing into EthernetConfigParser
...
For consistency.
Test: TH
Change-Id: Idefd43d5b22b8f5e02561601f3bc4142ce8a783e
Patrick Rohr
commited 2025-03-25 11:56:41 -07:00
5030594287
Merge "Removing interfaces from the InterfaceTracker when network is destroyed." into main am: 45a95e4b99
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3543880
Change-Id: I68bdb033e2a5c31145b0f6a70a0e82c9156fd7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sarup Dalwani
authored and
Automerger Merge Worker
commited 2025-03-25 08:04:51 -07:00
f2500c577f
Merge "Removing interfaces from the InterfaceTracker when network is destroyed." into main
Sarup Dalwani
authored and
Gerrit Code Review
commited 2025-03-25 07:40:41 -07:00
45a95e4b99
Address aosp/3541181 leftover comments
...
Test: atest TetheringTests CtsTetheringTest
Change-Id: Iee9c1eec33403c95e29656b3dfb1bfefea81108e
Paul Hu
commited 2025-03-25 10:02:37 +00:00
3f81aec099
Merge "Set BPF_F_NO_PREALLOC for BPF_MAP_TYPE_SK_STORAGE by default" into main am: 4231cf5957
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3559383
Change-Id: I546c75c71afecb9a6aae9e04b5cbc5d931def8ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2025-03-25 02:49:15 -07:00
cbbec0a24d
Merge "Set BPF_F_NO_PREALLOC for BPF_MAP_TYPE_SK_STORAGE by default" into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2025-03-25 02:26:00 -07:00
4231cf5957
Merge "Add Checks for mDNS Unregistration and Discovery Stop Operations" into main am: aba4c46b53
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3556288
Change-Id: Ic140caada3e318e1d09813d05eb62fb5f370f303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2025-03-25 02:04:34 -07:00
3be8a25efb
Merge "Add connectivity pre-check for ConnectivityManagerApi23Test" into main am: 2795a1afb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3554648
Change-Id: I93b86f0bcc15bfd9b6a3eaef32f90b6d7d21ea45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2025-03-25 02:04:13 -07:00
a9ad480d70
Merge "Add Checks for mDNS Unregistration and Discovery Stop Operations" into main
Paul Hu
authored and
Gerrit Code Review
commited 2025-03-25 01:42:24 -07:00
aba4c46b53
Merge "Add connectivity pre-check for ConnectivityManagerApi23Test" into main
Paul Hu
authored and
Gerrit Code Review
commited 2025-03-25 01:32:35 -07:00
2795a1afb0
Merge "Format MdnsUtilsTest" into main am: f0dcda3be3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3556293
Change-Id: Ib251b8695762081b5e4c432cd370501545907967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2025-03-24 21:44:10 -07:00
bdb6c117af
Merge "Format MdnsUtilsTest" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2025-03-24 21:16:34 -07:00
f0dcda3be3
Removing interfaces from the InterfaceTracker when network is destroyed.
...
Bug: 400681214
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.InterfaceTrackerTest
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivityservice.CSInterfaceTrackerTest
Change-Id: Ifb3388800dec6ed208ca28dba080c5b736f09d35
Sarup Dalwani
commited 2025-03-25 01:34:05 +00:00
28c0533bf0