Commit Graph

1121 Commits

Author SHA1 Message Date
Andriy Naborskyy
00583cf109 Merge "wear proxy behind portal" into main am: 6aec2583cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762234

Change-Id: Iaf80ac98301cc90cd6245b4ba6282ccc8efda681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:51:09 +00:00
Andriy Naborskyy
6aec2583cd Merge "wear proxy behind portal" into main 2023-09-27 17:39:30 +00:00
Motomu Utsumi
8ff87c846d Merge "cronet: Remove unused cronet_disabled api directory" into main am: 3f4bf87af6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745214

Change-Id: I2e9524cebcb571fad18c1e8ce9e6ceb5aa981ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 08:11:17 +00:00
Motomu Utsumi
3f4bf87af6 Merge "cronet: Remove unused cronet_disabled api directory" into main 2023-09-27 07:42:45 +00:00
Andriy Naborskyy
d032dd42ea wear proxy behind portal
Do not avoid captive portal on wear proxy network; keep network agent
after detecting portal.

Bug: 291112432
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I8f6669da62ebd76b6a46d2aec9b3ea563a08cb5e
2023-09-27 07:28:05 +00:00
Motomu Utsumi
b058107c82 Merge "Ignore @FlaggedApi annotated API in udc mainline branch" into udc-mainline-prod 2023-09-19 08:22:09 +00:00
Treehugger Robot
3a3392147d Merge "Add test for downstream tethering" into main am: dba0dbc7ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606668

Change-Id: I493b7179d0101682eb739ec451ebbb4da932c40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:09:54 +00:00
Motomu Utsumi
9ee37a0e60 Ignore @FlaggedApi annotated API in udc mainline branch
Merged-In since this is a udc-mainline-prod only change.

Test: m
Bug: 299411828
Merged-In: Ib69d2fdc1d73b36a08a3d8ae1f2c45b2bcffae64
Change-Id: I4870fbe882ce0ec995dcaeb8a2624071fee6dce7
2023-09-13 11:05:38 +09:00
Treehugger Robot
dba0dbc7ec Merge "Add test for downstream tethering" into main 2023-09-13 01:01:32 +00:00
Yuyang Huang
fca402abed Add test for downstream tethering
Add end-to-end testing for testing NsdManager advertising and
discovering works fine with downstream tethering interfaces.

Bug: 281639507
Test: atest NsdManagerTest
Change-Id: I5a66423f216cfe0c82db5128502c885980ab264b
2023-09-12 17:53:37 +09:00
Motomu Utsumi
6535fabb3f Merge changes If3217916,I86023b1f into main am: c6dc826c22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745020

Change-Id: Ib69d2fdc1d73b36a08a3d8ae1f2c45b2bcffae64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:49:39 +00:00
Motomu Utsumi
c6dc826c22 Merge changes If3217916,I86023b1f into main
* changes:
  Add java_defaults for @FlaggedApi handling
  Prepare api directory for udc mainline branch
2023-09-12 08:25:42 +00:00
Jean Chalard
ef2bb73172 Merge changes I0afdda02,I1c47f616 into main am: 5f730c6ab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2460069

Change-Id: Ib9b13167b5d9e22057f96d675f7f2f7d712a4907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 11:42:57 +00:00
Jean Chalard
5f730c6ab5 Merge changes I0afdda02,I1c47f616 into main
* changes:
  Implement ConnectivityStateMetrics sample
  Add base classes for common ConnectivityService tests.
2023-09-11 11:32:06 +00:00
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
Chalard Jean
f95e2de35a Implement ConnectivityStateMetrics sample
Test: ConnectivitySampleMetricsTest
Change-Id: I0afdda023208c3f8620cb5b89add66448af596d7
2023-09-11 17:12:46 +09: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
Motomu Utsumi
310f11acfe Add java_defaults for @FlaggedApi handling
This CL is a preparation to ignore @FlaggedApi API in udc mainline
branch

Bug: 299411828
Test: TH
Change-Id: If3217916b2c37ebaa7b48d8387c69cb078af9550
2023-09-08 14:47:03 +09:00
Motomu Utsumi
5dcd14569e Prepare api directory for udc mainline branch
udc-extended-api directory will be used only in udc mainline branch to
hide @FlaggedApi annotated api which is not supported in that branch

Copied api directories from udc mainline branch.

Bug: 299411828
Test: TH
Change-Id: I86023b1fb3e5f9b4b787a564303e6d2e60f74467
2023-09-08 11:42:21 +09:00
Motomu Utsumi
eaf2db01bb cronet: Remove unused cronet_disabled api directory
Test: TH
Change-Id: I183ae6cb802c84e36763215d80e90d4444e38e67
2023-09-07 16:36:48 +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