Commit Graph

1103 Commits

Author SHA1 Message Date
Motomu Utsumi
07bd512254 Merge "Merge remote-tracking branch 'remotes/aosp/tmp_libs_net_move' into libs_net_move_merge" into main am: 55850dccbf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745599

Change-Id: If7d1796c5a1642efa208a3171dc1006b9b49df83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 10:53:56 +00:00
Motomu Utsumi
c480039309 Merge remote-tracking branch 'remotes/aosp/tmp_libs_net_move' into libs_net_move_merge
frameworks/libs/net/common ->
packages/modules/Connectivity/staticlibs

frameworks/libs/net/client-libs ->
packages/modules/Connectivity/staticlbs/client-libs

Test: TH
Bug: 296014682
Change-Id: I5dc78f0c4653e20312ab3d488b1e69262dbb9840
2023-09-11 11:53:46 +09:00
Mark White
c1fdcd78b0 Merge "Created empty framework-location non-updatable module" into main am: e695330a89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727717

Change-Id: Ia9b084bcae91f9ddc633df7ad66b3961cb0e659d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 17:08:31 +00:00
Mark White
e695330a89 Merge "Created empty framework-location non-updatable module" into main 2023-08-31 16:00:53 +00:00
Mark White
e4d44639cb Created empty framework-location non-updatable module
Bug: 289776578
Test: CtsLocationCoarseTestCases CtsLocationFineTestCases CtsLocationGnssTestCases CtsLocationNoneTestCases CtsLocationPrivilegedTestCases

Change-Id: Ia57b9f10c8f506877003adf1d9b6e7201654921b
2023-08-30 20:44:07 +00:00
Junyu Lai
4ff6ae5950 Merge "Split BpfNetMaps constants and utilities into standalone classes" into main am: 50a7ecccf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720877

Change-Id: I96040478955eb24870f973e8545e89a10fb2c117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 11:16:33 +00:00
Junyu Lai
50a7ecccf1 Merge "Split BpfNetMaps constants and utilities into standalone classes" into main 2023-08-29 10:44:51 +00:00
Junyu Lai
29b7b6385a Split BpfNetMaps constants and utilities into standalone classes
This is a no-op refactoring that splits constants and utility
methods into standalone classes which will be shared with
a bpf reader class in subsequent CLs.

NO_IFTTT=No-op refactoring

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfNetMapsTest
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.net.module.util.StructTest

Bug: 297836825
Change-Id: I6d7ea044e43180ae001573009a166be74ebe6a5d
2023-08-29 08:20:10 +00:00
Igor Zaslavsky
3624a2b0ad Merge "Add RemoteAuthService" into main am: a92d8cab5f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2685327

Change-Id: Iaccc31ac6f55cc0aa7a835e21ecbea62cafef0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:47:33 +00:00
Igor Zaslavsky
ec344f4c18 Add RemoteAuthService
Add RemoteAuthService APIs and Stubs (hide) for Settings of D2DA

This CL introduces new SystemApi allow user to discover remote devices
compatible to be registered as remote authenticators via RemoteAuthManager

Design doc: go/remote-auth-manager-fishfood-design

Test: built successfully.
Bug: 290092977
API-Coverage-Bug: 294934095
Change-Id: Iaaae1126065fdc3db469eeb8d85ac654b8199a12
2023-08-24 17:50:11 +00:00
Stefano Duo
a08943e97d Merge "Also bundle Cronet telemetry jar" into main am: 5e542536cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2645666

Change-Id: I3370b97c78bd979fa0c4254d35d1089d3f4646be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:05:10 +00:00
Stefano Duo
2a90733b08 Also bundle Cronet telemetry jar
Bug: 284972285
Test: m & atest NetHttpTests
Change-Id: Id24fa826f617187722b329821dae9d9548bf218b
2023-08-21 16:51:08 +01:00
Yuyang Huang
32a0142d7f Add callbacks for service offload am: 33fa4d268c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435053

Change-Id: I5ec211a4ebeeaa6fa03f5bbc4aaa356b9fed230f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:09:06 +00:00
Yuyang Huang
33fa4d268c Add callbacks for service offload
Components that can provide offload like IpClient (packet
filter offloading) can use the API to register a callback to be notified
when offload is necessary.

Bug: 269240366
Test: atest CtsNetTestCases
Change-Id: I8080702f5b530001b88e79e504f4722ac01bc576
2023-08-04 19:22:15 +09:00
Casey Borders
5f4a2b1232 RemoteAuth Boilerplate am: 13a35ea213
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2657759

Change-Id: I70f8be3070dc1f326c5f28f0dacab71ff65cc619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 01:40:33 +00:00
Casey Borders
13a35ea213 RemoteAuth Boilerplate
Stub out code and test directories

BUG: 290094832
Test: atest FrameworksNetTests RemoteAuthUnitTests
Change-Id: I850242640f32bea3d46febcde5f3719619b1ea07
2023-07-31 21:41:26 +00:00
Treehugger Robot
c99f7e5032 Merge "Address comment from ag/12107302" into main am: 88c497c2e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678019

Change-Id: Icf7c83cfac67f2c7f91578c78e33700d6641a94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 06:05:14 +00:00
Chalard Jean
f8d1d6c4f9 Address comment from ag/12107302
Test: trivial doc-only change
Bug: 140807677
Change-Id: I57440e8b54709a2f0e8c875d30f2c295fa3e1f3d
2023-07-27 17:29:18 +09:00
Patrick Rohr
14c703315c NetworkCapabilities: initialize ALL_VALID_CAPABILITIES without loop am: 7a042d869f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2666059

Change-Id: I08dd8a7ef5393954cff2c139bee632b57f3352c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 00:19:15 +00:00
Patrick Rohr
7a042d869f NetworkCapabilities: initialize ALL_VALID_CAPABILITIES without loop
This change also removes the MIN_NET_CAPABILITY constant that is not
actually used and can always be re-added in the future (though, I would
imagine that NetworkCapabilities will not be deprecated / removed in
numerical order).

Test: TH
Change-Id: I97ccbc9e915eb74a0ef52c576e16fc8ce8d5b646
2023-07-19 14:24:00 -07:00
Treehugger Robot
70119d9953 Merge "Deduplicate the isIpv6ULA implementation." into main am: 4b19802eee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2662175

Change-Id: I6bd662865f4ecdecae6b7db13902a3c791af9787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:48:28 +00:00
Treehugger Robot
4b19802eee Merge "Deduplicate the isIpv6ULA implementation." into main 2023-07-19 02:25:20 +00:00
Patrick Rohr
1c16b8f295 NetworkCapabilities: convert ALL_VALID_CAPABILITIES to long am: 200bd72898
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2661475

Change-Id: I9959e113b27302bce83a4843489f124595a9aaff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 16:44:00 +00:00
Xiao Ma
a74b0066e0 Deduplicate the isIpv6ULA implementation.
Leverage the ConnectivityUtils#isIPv6ULA implementation which is also
accessible for modules, to deduplicate the implementation.

Bug: 183601771
Test: TH
Change-Id: I0943cd76f95e2f54d619015231f68b326194c8b9
2023-07-18 20:04:43 +09:00
Patrick Rohr
200bd72898 NetworkCapabilities: convert ALL_VALID_CAPABILITIES to long
ALL_VALID_CAPABILITIES should be a long, since there are now 35 NetworkCapabilities that are stored in a bitfield.

This caused NetworkCapabilities to be lost during parceling.

Bug: 291160389
Test: TH
Change-Id: Ia021ba5fd2094fdaec87446c73de2037c920c4f1
2023-07-18 02:35:32 +00:00
Patrick Rohr
944febbfd7 Merge changes from topic "revert-2657749-revert-2647150-httpclient-wrapper-GZUDLKEBSH-IKOKBJPMHS" into main am: 81559e711f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2660058

Change-Id: I2affca875caaf1d7df0264f9d14295bbddee7194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:44:17 +00:00
Stefano Duo
2cf46934c5 Revert^2 "Connectivity: Depend on new httpclient targets"
6333cc4899

Change-Id: I683818ac77e688b4a62b594000bb235a23cbe6df
2023-07-17 14:52:16 +00:00
Stefano Duo
f063c3d70b Merge changes from topic "revert-2647150-httpclient-wrapper-GZUDLKEBSH" into main am: bb873a0615
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2657750

Change-Id: Ief1894ff728d875b21cb22a3071bfdd2799f9a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 09:21:08 +00:00
Stefano Duo
6333cc4899 Revert "Connectivity: Depend on new httpclient targets"
Revert submission 2647150-httpclient-wrapper

Reason for revert: ndk build break (b/291449552)

Reverted changes: /q/submissionid:2647150-httpclient-wrapper

Change-Id: Ic90a625d105e8ad310eb93758a776ff5b764f67a
2023-07-17 08:44:56 +00:00
Stefano Duo
7fad02b6e0 Merge changes from topic "httpclient-wrapper" into main am: 73a61abe1a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2651828

Change-Id: If32bf21b11e9800e0aa223ed73a02e0c85cad849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:12:26 +00:00
Stefano Duo
0fb7f7b787 Connectivity: Depend on new httpclient targets
Bug: 288886953
Change-Id: I23d883cb7d20696651c4bcf309f06cd3dfad397d
2023-07-07 14:39:56 +01:00
Treehugger Robot
86238fee41 Merge "Correct typo variable" am: cc3f9888e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2626269

Change-Id: Ibae2150065bd9c8689a10b1778286e296ea5674a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 04:20:26 +00:00
chiachangwang
980e767188 Correct typo variable
Bug: 196453719
Test: atest FrameworksNetTests
Change-Id: I97604d077433f4c5505912f9cbebab77a43fb548
2023-06-15 01:43:07 +00:00
Maciej Żenczykowski
65e9997c67 Merge "Add helper method to generate a v6 NAT-T keepalive packet" am: 977fa60f5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2616796

Change-Id: I198a5b70928affacda9496ba30f58e12ec05603a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:42:05 +00:00
chiachangwang
c18f0bbbb3 Add helper method to generate a v6 NAT-T keepalive packet
This is a part of preliminary work for sending a v6 NAT-T
keepalive packet in a v6 only network. This commit
release the constraint on constructing a v6 NAT-T keepalive
packet.

Bug: 196453719
Test: Manually connect to v6 only network and check if the
      keepalive packets are sent with subsequent commit
Test: atest FrameworksNetTests with the updated test
Change-Id: I9dc96e840265c5dee6b9e3ef2b3901a0aeb4ff9e
2023-06-13 11:50:13 +00:00
chiachangwang
812d856e57 Set DF flag on NAT-T keepalive packet am: c6a2f6faf5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2616795

Change-Id: I6a18a9f3e25a603ae165df6057964ab3dbe506cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:52:48 +00:00
chiachangwang
96b4b4527c Make a v4 nattKeepalivePacket helper method am: df347448a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2616794

Change-Id: I6905fbec579bc4c82fae0d19ccd84a2446d9760f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:52:38 +00:00
chiachangwang
c6a2f6faf5 Set DF flag on NAT-T keepalive packet
This commit
- Set the DF flag on the NAT-T keepalive packet
- Add comment for TTL value
- Do some cleanups

Bug: 196453719
Test: m
Change-Id: I401ae52d8f16e43120210cdea223fd251d53ea3b
2023-06-07 02:05:27 +00:00
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
373be74480 Merge "Fix a bug where the PAC proxy port is not set correctly." am: f2b38772ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729153

Change-Id: Icc9da3c5a95db0712bfbedf884e1e949cdc56ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 12:59:05 +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
a5e5fe5e66 Merge "DO not throw exception for ERROR_NO_SUCH_SLOT error" am: 95336cf4fc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593906

Change-Id: Ic294a0f089b51b84ffbd0b5b00811c04a0fcb491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 07:22:56 +00:00
Chiachang Wang
95336cf4fc Merge "DO not throw exception for ERROR_NO_SUCH_SLOT error" 2023-05-23 07:13:52 +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
62bdbd1576 Merge "Improve doc for CSM#setGlobalProxy" am: b92d8ccd39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535862

Change-Id: I0d2001674e691cc52497aa303f1b1e1850efe38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 04:55:23 +00:00
Treehugger Robot
b92d8ccd39 Merge "Improve doc for CSM#setGlobalProxy" 2023-05-23 04:04:45 +00:00
Treehugger Robot
8af1611fe0 Merge "LinkProperties: use ordered comparison for P-CSCFs - only on U+" am: 78e158f2bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2596485

Change-Id: I2f0c358ff1d4d1ba9e5de4a625cf4d58e4cd05ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 05:39:33 +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
4026eca58f Merge "Fix agents disconnecting in SUSPENDED state." am: ec4511c8aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2583410

Change-Id: I0a4c0c474c3e43237fb6100aa931b7f09fc49b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 02:05:45 +00:00
Motomu Utsumi
ec4511c8aa Merge "Fix agents disconnecting in SUSPENDED state." 2023-05-17 01:59:18 +00:00