Commit Graph

922 Commits

Author SHA1 Message Date
Patrick Rohr
6e53f640d7 Merge "Fix broken documentation in Connectivity" into main am: 0eab476f7a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786128

Change-Id: I36928431b915ac225bf40f57426b3a90c0fd3cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 20:02:08 +00:00
Patrick Rohr
0eab476f7a Merge "Fix broken documentation in Connectivity" into main 2023-10-13 19:30:52 +00:00
Anton Hansson
5ac6c0b05b Fix broken documentation in Connectivity
EthernetManager is @SystemApi, so cannot be referenced from public
API.

Bug: 303184203
Test: m docs
Change-Id: Ib5cc07c89b4ecfdeae704da131ebb307816e35fa
2023-10-13 15:25:26 +00:00
Paul Duffin
e531db3c9a Add additional overriding methods to signature files
This change adds overriding methods that are essential to compile the
stubs generated from the signature files.

More information and the background for this change is available at
go/add-overriding-one-pager.

Ignore-AOSP-First: Needs to be done in udc-mainline-prod first
Test: m checkapi
Bug: 299366704
Change-Id: Idba307148fd9afa87bfb7e0c89e00d9bd97ec204
2023-10-12 21:56:21 +00:00
Paul Duffin
b3c3f2e9d0 Add additional overriding methods to signature files
This change adds overriding methods that are essential to compile the
stubs generated from the signature files.

More information and the background for this change is available at
go/add-overriding-one-pager.

Test: m checkapi
Bug: 299366704
Change-Id: Idba307148fd9afa87bfb7e0c89e00d9bd97ec204
2023-10-12 19:21:07 +01:00
Jihoon Kang
9df878785f Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 415773ed06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781647

Change-Id: I33c7e6c3198e863941ee3a03175dc73cc76a6ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:39:39 +00:00
Paul Duffin
7bd2d108ea Prepare for keeping concrete overrides of abstract methods
Currently, metalava will discard concrete overrides of abstract methods
from the API signature files which causes problems when attempting to
generate stubs from those files and also discards information that may
be important in API reviews. This change is the first step in the
process of changing that behavior.

This change hard codes the current behavior for discarding the concrete
overrides (`add-additional-overrides=no`) into those signature files
that will (or are likely) to be affected by the change in behavior.
That allows the default behavior to be changed for all the other files
without affecting these.

Follow up changes will remove the hard coding from the signature files
and will update the contents which will include the concrete overrides
of the abstract methods.

More information and the background for this change is available at
go/add-overriding-one-pager.

Test: m checkapi
Bug: 299366704
Change-Id: I52c5bbe2e3bbd36019fe44fcb0b2d19876a5a869
2023-10-10 17:11:25 +01:00
Treehugger Robot
06453bd65a Merge "OWNERS: master -> main" into main am: 66f39a5667
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765565

Change-Id: I5ded059a17bb94d816f4eb9b3d1041a842c78a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:48:00 +00:00
Maciej Żenczykowski
13e2ff7717 OWNERS: master -> main am: a1ab4aaeb5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765545

Change-Id: Ia9cedb7d9937c0d45fa8421e36ed865bc3aece62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:45:24 +00:00
Treehugger Robot
a6f78e46da Merge "OWNERS: master -> main" into main am: 66f39a5667
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765565

Change-Id: Ie4441cac99af2406add883a04457e133e8be3920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:45:17 +00:00
Maciej Żenczykowski
fd0faa8faf OWNERS: master -> main am: a1ab4aaeb5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765545

Change-Id: I7fe17ae9d94d7885ff7ada233d35a5a283be15b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:45:06 +00:00
Treehugger Robot
66f39a5667 Merge "OWNERS: master -> main" into main 2023-09-27 19:31:13 +00:00
Maciej Żenczykowski
9ec09ec315 OWNERS: master -> main
Change-Id: I7912bf91841a4260d0a1eec022a6a832b312321d
2023-09-27 19:29:11 +00:00
Maciej Żenczykowski
a1ab4aaeb5 OWNERS: master -> main
Change-Id: Iad7d1818d1959024d5fd1fc8810d2b7ce0f06e40
2023-09-27 19:29:09 +00:00
Igor Zaslavsky
2d8debe62c Merge "Park RemoteAuth Manager and Service" into main am: f0afc53836
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759205

Change-Id: I6e3f1ddf1d6c7f8e645a327f59e666851ccb4918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:20:50 +00:00
Igor Zaslavsky
22abe1ba04 Merge "Park RemoteAuth Manager and Service" into main am: f0afc53836
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759205

Change-Id: I52409a1b45c325cf19804c568050511f25c150a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:19:27 +00:00
Igor Zaslavsky
e336586353 Park RemoteAuth Manager and Service
Limit the amount of parked code built into Connectivity module

Test: built successfully.
Bug: 300522527
Change-Id: I87d7516011c469aa89fc7e67cf03c4ee8aa1bb9b
2023-09-22 04:09:02 +00:00
Kangping Dong
f8d0c8e128 Merge "[Thread] initial Thread network service" into main am: 01e6dadd1f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2721333

Change-Id: I23a484fb28aa9d2e8a006794fbc3bc98e8c0b64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:29:33 +00:00
Kangping Dong
e5f1122ec9 Merge "[Thread] initial Thread network service" into main am: 01e6dadd1f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2721333

Change-Id: I5b1dad9c40dcade78c352265164da0992a3fcb0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:29:17 +00:00
Kangping Dong
01e6dadd1f Merge "[Thread] initial Thread network service" into main 2023-09-19 11:25:37 +00:00
Yuyang Huang
1e5cbb7fab Merge "Add newApi linter check for mDNS library" into main am: 365cf0a393
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2718538

Change-Id: Ieccf196ee19b7d94ff48cba35e9b24ee795ffbc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 06:18:11 +00:00
Yuyang Huang
8992911f24 Merge "Add newApi linter check for mDNS library" into main am: 365cf0a393
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2718538

Change-Id: I6e392853943db3ff509bc25a4055367774e65cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 06:17:54 +00:00
Yuyang Huang
365cf0a393 Merge "Add newApi linter check for mDNS library" into main 2023-09-13 05:55:51 +00:00
Kangping Dong
1cec48f3c0 [Thread] initial Thread network service
This commit sets up the initial Thread network service for the
Android Thread feature which allows an Android device to create
a Thread network and being a Border Router.

See https://www.threadgroup.org/What-is-Thread for background of
Thread.

See b/235016403 for the Android Thread feature request.

Test: lunch aosp_cf_x86_64_tv-userdebug
      m && launch_cvd
      atest CtsThreadNetworkTestCases
Bug: 262683651
Change-Id: Ie1bb23084531f67165ec068ea3ca39592dbc01d1
2023-09-12 21:48:57 +08:00
Yuyang Huang
fc83170c70 Add newApi linter check for mDNS library
The mDNS library need to be backported to some internal library which
support minSdk 21. Therefore, updated the build rules to add the linter
check.

Bug: 296175311
Test: TH
Change-Id: Iae0bffa315dc6de2339a05f595b13480fa7385ae
2023-09-12 19:01:21 +09:00
Motomu Utsumi
b2597e6ad5 Merge changes If3217916,I86023b1f into main am: c6dc826c22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745020

Change-Id: I3c59e96e5686f75f2beb1fc62811744ea05951e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:51:57 +00: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
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
e7b496fcb6 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: Icc1d7a4e4b2c0ed9f55fd2472a100723ade6a847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 10:53:38 +00:00
Motomu Utsumi
55850dccbf Merge "Merge remote-tracking branch 'remotes/aosp/tmp_libs_net_move' into libs_net_move_merge" into main 2023-09-11 10:06: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
Treehugger Robot
63b9d4a04c Merge "Address review followup comments for NetworkStats" into main am: 8df4d76aa2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2723093

Change-Id: I0a517bfebe79a8a5b69cb726b5a9200bc669685a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 21:21:19 +00:00
Treehugger Robot
940d33071a Merge "Address review followup comments for NetworkStats" into main am: 8df4d76aa2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2723093

Change-Id: I6901fbd6b209abb906886317055c64bf81f2d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 20:30:49 +00:00
Treehugger Robot
8df4d76aa2 Merge "Address review followup comments for NetworkStats" into main 2023-09-08 20:11:03 +00:00
Yuyang Huang
be5914df05 Merge "Add comments for framework-connectivity-t-mdns-standalone-build-sources" into main am: 29c616d76e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745718

Change-Id: I3a81e640a42a2ecc28df7d1146f55e5e66f48928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 09:18:23 +00:00
Yuyang Huang
206779aab3 Merge "Add comments for framework-connectivity-t-mdns-standalone-build-sources" into main am: 29c616d76e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745718

Change-Id: I4f6a1976d069771e38cccc5d0042380021f3c459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 09:18:18 +00:00
Yuyang Huang
cf25a8a766 Add comments for framework-connectivity-t-mdns-standalone-build-sources
framework-connectivity-t-mdns-standalone-build-sources should only be
used for building service-connectivity-mdns-standalone-build-test. Added
comment to prevent this filegroup being used in wrong way.

Test: TH
Change-Id: I11dd390967db1a115dcadcdebc20f226ab6c0a51
2023-09-08 14:51:08 +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
Yuyang Huang
3d77d57476 Merge "Send rawOffloadPacket to OffloadEngine" into udc-mainline-prod 2023-09-06 05:51:20 +00:00
Yuyang Huang
fb47d0c799 Send rawOffloadPacket to OffloadEngine
Add the missing logic to send the rawOffloadPacket to OffloadEngine.

Bug: 297314970
Test: atest
(cherry picked from https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2730493)

Ignore-AOSP-First: Merge conflict on this branch
Change-Id: I897d5077bd82f14340efa07d8012dae17a1d1b87
2023-09-06 11:54:24 +09:00
Yuyang Huang
74c5b24801 Merge "Send rawOffloadPacket to OffloadEngine" into main am: a337d95cc4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2730493

Change-Id: If3a845d966fca2377bc3977e39a0e39cb1756c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:00:06 +00:00
Yuyang Huang
31f6e2eccb Send rawOffloadPacket to OffloadEngine
Add the missing logic to send the rawOffloadPacket to OffloadEngine.

Bug: 297314970
Test: atest CtsNetTestCases FrameworksNetTestCases
Change-Id: I06d7a9bb84df72808eff4f0c9df60f7e60aa2a2c
2023-09-05 08:51:04 +00:00
Remi NGUYEN VAN
27ad67e3f6 Do not build remoteauth in udc branches
Remotauth is not compatible with U, so building it in udc-based branches
is not necessary, and it would be hard to backport dependencies as
needed.

This change causes fallback sources to be built instead of
remoteauth/service and remoteauth/framework: stubs should only be needed
for entry points into the module, so the stubs should not need to be
modified often.

The remoteauth sources are still used for generating the API (as per
api_srcs in framework-connectivity-t), to avoid merge conflicts in the
API .txt files. But the implementation jar actually used on device or
shipped via module updates does not contain the API classes. In practice
this means that API stubs are generated through metalava from the
remoteauth sources, and these need to be built. So the API surface
itself cannot depend on V+ classes (APIs cannot take V+ classes as
arguments or return them). This is the case anyway, as
framework-connectivity-t is on the bootclasspath on T+; and in general,
module bootclasspath jars need to avoid depending on newer framework
classes as they may not exist on older devices using the module.

This change should only go to udc branches; note the merged-in below
refers to a change that was merged in all relevant branches, to ensure
that this change is not automerged anywhere.

Bug: 295788084
Test: m
Merged-In: I850242640f32bea3d46febcde5f3719619b1ea07
Change-Id: If533fef926ea0ad4e1e0b4d60c8f8e60f363fc1b
2023-09-05 15:22:06 +09:00
Remi NGUYEN VAN
85e7beb01b Merge "Factor out remoteauth dependencies to variables" into main am: 9bfa7ac0b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705538

Change-Id: Iff4f8b0a70fb8de25b2015a86010e0b168f47064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 05:24:39 +00:00
Remi NGUYEN VAN
baa2a7f3ab Merge "Factor out remoteauth dependencies to variables" into main am: 9bfa7ac0b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705538

Change-Id: Ia639995902ec219d333b60680868b6e59ed32169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 05:24:23 +00:00
Junyu Lai
35c69c7986 Address review followup comments for NetworkStats
This change includes:
1. Mark groupedBy*() deprecated and throw after android U.
2. Modify map() to mapKeysNotNull().
3. rename clearInterfaces to withoutInterfaces and refactoring.
4. Modify tests accordingly.

Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkStatsTest
Fix: 296149902
Fix: 296150018
Change-Id: I5d97422ba957a212c0c5fbc1eee3f8b174343348
2023-09-04 18:01:14 +08:00
Remi NGUYEN VAN
c41daa4106 Factor out remoteauth dependencies to variables
This will allow using different values for the variables without having
merge conflicts in the dependencies list for each build rule.

Bug: 295788084
Test: m
Change-Id: I7b64a5a01d1f8139e7ce30ce95903d71cb09de9f
2023-08-31 19:08:17 +09:00
Igor Zaslavsky
378d54c4d5 Merge "Removing SystemApi added in aosp/2685327" into main am: e423ae1076
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733765

Change-Id: I78bc441c765538098017916007b443671cb95fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 10:07:08 +00:00