Commit graph

97,576 commits

Message SHA1
Merge "Store the SubscriptionId together with the Carrier UID" into main am: 9a5aaaccf6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956897

Change-Id: Ida00dc41b73a71b43f58e1746f3e10fb96b397c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Ying Xu   authored and   Automerger Merge Worker   commited 2024-02-20 22:17:30 +00:00
65ba2e69bd
Merge "Store the SubscriptionId together with the Carrier UID" into main
Ying Xu   authored and   Gerrit Code Review   commited 2024-02-20 21:46:49 +00:00
9a5aaaccf6
Store the SubscriptionId together with the Carrier UID
Always store the corresponding SubscriptionId together with the Carrier
uid so that when the carrier loses the Privilege, both the uid and
SubscriptionID will be used in the onCarrierPrivilegesLost callback

Bug: 324357121
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.CarrierPrivilegeAuthenticatorTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I28e51c583261a67d4441c6f825ade6781b862ee4

Ying Xu   commited 2024-02-20 08:58:31 -08:00
0d06b9460a
Merge "Use async private DNS resolution for privdns CTS" into main am: cc2e593d7b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2908200

Change-Id: I6c17ba9d9b5a85f36b9fe0a6d5232a780850158c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-02-20 12:26:57 +00:00
30597b9a49
Merge "Use async private DNS resolution for privdns CTS" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-20 11:46:57 +00:00
cc2e593d7b
[Thread] disable Thread when user restriction is set am: 505b5ce45b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2968083

Change-Id: Ia00feb2fc32deada8e470de9b478e0b631f4462d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-02-20 11:24:24 +00:00
0cb8a7f7a2
[Thread] disable Thread when user restriction is set
This commit follows the guideline in go/ae-v-thread-admin-control that
Thread radio should be disabled when the user restriction is set and
nobody can enable Thread again (it fails with
ERROR_FAILED_PRECONDIFITION).

This commit adds only unit tests, E2E CTS tests are tracked in b/319079428

Bug: 319077876
Change-Id: I8981aa9e71948c64ee79701427ac794880826327

Kangping Dong   commited 2024-02-20 15:56:42 +08:00
505b5ce45b
Add sdk_version to test libraries am: e521ae306a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2968303

Change-Id: I12451d7ff74aee40810eb1d173a7edc56f0dd20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Zhi Dou   authored and   Automerger Merge Worker   commited 2024-02-20 02:20:06 +00:00
3386838739
Add sdk_version to test libraries
If sdk_version is empty, by default the library will be built against
the implementation of the framework jars. There are on going project to
automatically repackaging flag libraries in the libray which is built
direactly against the implementation of the framework jars.

This change set the right sdk_version for the testing library.

Bug: 310504781
Test: atest jarjar-rules-generator-test and CI
Change-Id: I24d8dc47f7ed83f0b84c632d24396e2bdf932424

Zhi Dou   commited 2024-02-19 18:36:40 +00:00
e521ae306a
Merge "[mdns] fix the logic of finding the existing service" into main am: 4c0b2f6c63
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2968064

Change-Id: I6b672dc37d3b7c750d94ae1db6d214ebcc9e27d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Handa Wang   authored and   Automerger Merge Worker   commited 2024-02-19 11:15:39 +00:00
7810d88c20
Merge "[mdns] fix the logic of finding the existing service" into main
Handa Wang   authored and   Gerrit Code Review   commited 2024-02-19 11:02:16 +00:00
4c0b2f6c63
Merge "Add a test case that a Border Router sends a UDP message to Thread device" into main am: b206809a64
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2966916

Change-Id: Iedbcead1905af38abd699b0d4349f03979d9fa7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Handa Wang   authored and   Automerger Merge Worker   commited 2024-02-19 10:55:13 +00:00
6d0e1f506a
Merge "Add a test case that a Border Router sends a UDP message to Thread device" into main
Handa Wang   authored and   Gerrit Code Review   commited 2024-02-19 10:25:46 +00:00
b206809a64
Merge "Update flags.aconfig to follow the current APIs" into main am: 1ec06555e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2964822

Change-Id: I2271e176cbc9a5cea772a01c8f6659b9e8f96f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2024-02-19 09:52:29 +00:00
6c1760ad8e
Merge "Update flags.aconfig to follow the current APIs" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2024-02-19 09:21:54 +00:00
1ec06555e1
Update flags.aconfig to follow the current APIs
This CL also specifies aconfig_declaration module in java_sdk_library
register_nsd_offload_engine will be moved to the platform flags.aconfig
in the followup CL.

Test: TH
Change-Id: I430a5f0b1e1ef2e3394cf6aa8efebbd46da41765

Motomu Utsumi   commited 2024-02-19 06:58:35 +00:00
52f294cbc4
[mdns] fix the logic of finding the existing service
When adding a service, the MdnsRecordRepository finds the
existing service solely by service name, which is wrong. it should check
both the service name and the service type.

Bug: 325862182

Change-Id: I72c6837d0dfb41fc9b2d7763e18b3f5415f8c0d9

Handa Wang   commited 2024-02-19 06:40:59 +00:00
10b99ce48f
Add a test case that a Border Router sends a UDP message to Thread device
This test case lets the BR send a UDP message to Thread device using
socket API and verify the message is received on the Thread device via
ot-ctl udp command.

For now this only verifies the direction BR -> ED because the other
direction ED -> BR is depending on platform UDP feature which is not
enabled yet.

Bug: 321168973
Test:  atest ThreadNetworkIntegrationTests:BorderRoutingTest#unicastRouting_borderRouterSendsUdpToThreadDevice_datagramReceived

Change-Id: I590583dd818f3d72dec41184e5427a8b08f842bb

Handa Wang   commited 2024-02-19 03:24:38 +00:00
b5c6ac2fe7
Merge "netbpfload: V+ x86 require 64-bit kernel" into main am: e7ceb1dc29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2966804

Change-Id: Ie64ff08bc8d9bb2071cfd26e954f25988fc4c9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Ĺ»enczykowski   authored and   Automerger Merge Worker   commited 2024-02-17 05:33:38 +00:00
d78e86fc02
Merge "netbpfload: V+ x86 require 64-bit kernel" into main
Maciej Ĺ»enczykowski   authored and   Gerrit Code Review   commited 2024-02-17 04:47:07 +00:00
e7ceb1dc29
Merge "eliminate some casts" into main am: 60a657f4bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2966802

Change-Id: I42052b0982bc4c3d98063adc4267f9c262c67fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Ĺ»enczykowski   authored and   Automerger Merge Worker   commited 2024-02-17 04:31:17 +00:00
941b43f4bb
Merge "eliminate some casts" into main
Maciej Ĺ»enczykowski   authored and   Gerrit Code Review   commited 2024-02-17 03:56:19 +00:00
60a657f4bf
netbpfload: V+ x86 require 64-bit kernel
For reasoning see:
  https://android-review.googlesource.com/c/platform/system/netd/+/2966803

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If479b0443a64e0bf98ca89016d42ca37e231c576

Maciej Ĺ»enczykowski   commited 2024-02-17 03:47:52 +00:00
7f6a42672d
eliminate some casts
follow up to http://aosp/2965923 to hopefully eliminate
that class of bug in the future...

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie09db001ff15a6b2b15bb1bb0c1ce8228e162337

Maciej Ĺ»enczykowski   commited 2024-02-16 18:20:55 +00:00
d7ade39c0c
Merge "Add CtsNetTestCases to MTS" into main am: 2e29f6dd42
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2963602

Change-Id: Iee694ec5908892ad5ce7fb90d8bb82b9ece3d7b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-02-16 12:09:18 +00:00
38fb0b7528
Merge "Add CtsNetTestCases to MTS" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-16 11:34:16 +00:00
2e29f6dd42
Merge "Use uint_32 for UidOwnerMatchType" into main am: 17dd9e9fa8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2965923

Change-Id: Idc94008030137905b6802e74fcd3f2cbb1b0bb4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Ĺ»enczykowski   authored and   Automerger Merge Worker   commited 2024-02-16 06:10:30 +00:00
0b98332ba3
Merge "Use uint_32 for UidOwnerMatchType" into main
Maciej Ĺ»enczykowski   authored and   Gerrit Code Review   commited 2024-02-16 05:26:31 +00:00
17dd9e9fa8
Merge "Temporarily skip the tests for background restrictions" into main am: 50667525c7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2966462

Change-Id: I14706e727022c90fde644628183229f4453aaf37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Suprabh Shukla   authored and   Automerger Merge Worker   commited 2024-02-16 03:02:54 +00:00
6fb58b6822
Merge "Annotate NetworkRequestTest as ConnectivityModuleTest." into main am: eb7a11cb22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956912

Change-Id: Ibcf2014b5891140fe11c88cefca3c0d0f6ca0adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2024-02-16 03:01:38 +00:00
340ae37026
Merge "Temporarily skip the tests for background restrictions" into main
Suprabh Shukla   authored and   Gerrit Code Review   commited 2024-02-16 02:41:34 +00:00
50667525c7
Merge "Annotate NetworkRequestTest as ConnectivityModuleTest." into main
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2024-02-16 02:36:17 +00:00
eb7a11cb22
Merge "IpSecTransformState: Rename API methods and improve docs" into main am: 69171c6ca5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2911290

Change-Id: Ice0bc1a2e8d77c79127b8cb232694d498df85107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-02-16 01:37:53 +00:00
b9af8ef5d3
Merge "IpSecTransformState: Rename API methods and improve docs" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-02-16 01:12:21 +00:00
69171c6ca5
Temporarily skip the tests for background restrictions
Test: atest CtsHostsideNetworkTests

Bug: 304347838
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4cef70d592e91c2ccd3419f52bf779e29fcb4a79)
Merged-In: I88ffa390a890a09d95109518329ba6abcb162bc1
Change-Id: I88ffa390a890a09d95109518329ba6abcb162bc1

Suprabh Shukla   authored and   Android Build Cherrypicker Worker   commited 2024-02-15 22:30:39 +00:00
6266342327
Use uint_32 for UidOwnerMatchType
The enum is already using 12 bits, so using fewer bits loses information.
This is in sync with the UidOwnerValue struct used to contain this data.

Test: atest resolv_integration_test
Test: atest resolv_unit_test

Bug: 325150155
Change-Id: Ide0ccea9614cda803b3700a0cc22977e9608209e

Suprabh Shukla   commited 2024-02-15 12:54:48 -08:00
c806db20f7
IpSecTransformState: Rename API methods and improve docs
Rename API methods and update API docs as per API
council feedbacks

Bug: 316603231
Test: make update-api && make
Change-Id: Ibb1f58792d2e40ef1084c2b532e999a516a87b37

Yan Yan   commited 2024-02-15 20:17:30 +00:00
1db3feeed7
Update javadoc for NET_CAPABILITY_LOCAL_NETWORK API am: 4f956270f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2964823

Change-Id: I0a526af0e8b5318183ecba3e1cc0876b7afd83a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2024-02-15 08:31:27 +00:00
d6ac3ca9ef
Update javadoc for NET_CAPABILITY_LOCAL_NETWORK API
Bug: 324326824
Test: TH
Change-Id: I6d5f9c27b2fc2f2290e27f63b933b9ccacfffa85

Motomu Utsumi   commited 2024-02-15 15:41:50 +09:00
4f956270f7
Merge "Make TetheringRequest parcelable" into main am: 211e7862b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2953588

Change-Id: If3975efd6558e9dd6513a3d390df05eff61b8b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Quang Luong   authored and   Automerger Merge Worker   commited 2024-02-15 05:16:23 +00:00
e2cd6bbf8d
Merge "Make TetheringRequest parcelable" into main
Quang Luong   authored and   Gerrit Code Review   commited 2024-02-15 04:20:03 +00:00
211e7862b6
Make TetheringRequest parcelable
Make TetheringRequest parcelable so we can pass it via Wifi APIs and map
Soft AP state changes to the correct request.

Bug: 216524590
Test: build
Change-Id: I63a45b14e9abc288b353159dfdcbe96fde485cb7

Quang Anh Luong   commited 2024-02-15 10:15:05 +09:00
1252f7f428
Merge "CTS for default background network restrictions" into main am: a65d8f3a4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2924991

Change-Id: I7a63cb718dcea4d53255c7106e4742be03a634bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Suprabh Shukla   authored and   Automerger Merge Worker   commited 2024-02-14 20:07:15 +00:00
72831fe664
Merge "CTS for default background network restrictions" into main
Suprabh Shukla   authored and   Gerrit Code Review   commited 2024-02-14 19:21:48 +00:00
a65d8f3a4c
Add CtsNetTestCases to MTS
CtsNetTestCasesLatestSdk was originally used for MTS to prevent
installation issues with CUR_DEVELOPMENT target SDK modules (as is the
case for CtsNetTestCases) not installing on released devices.

However setting the min_sdk to a given value should be enough for that
purpose. While there may have been other blockers requiring separation
of CtsNetTestCases and CtsNetTestCasesLatestSdk at the time (in the Q/R
timeframe), more recent modules like CtsAdServicesDeviceTestCases seem
to be using CUR_DEVELOPMENT target SDK in MTS just fine.

Not specifying a target SDK means that the branch default will be used,
depending on the release configuration. So for example trunk_staging
would typically be CUR_DEVELOPMENT=10000, and "next" may use the SDK
version of that release.
This makes sense as a test suite targeting CUR_DEVELOPMENT is necessary
to verify a development build, while a production "next" configuration
should generally use the latest released SDK. But in any case, for
CtsNetTestCases purposes, this would cause the exercised connectivity
APIs to use their latest non-compatibility behavior, which is what
tests expect.

Considering this, add CtsNetTestCases to MTS, so that
CtsNetTestCasesLatestSdk can be removed. This will allow having one test
suite for both CTS and MTS, which in turns allows marking
CtsNetTestCases as MCTS, so that the version of the test to run is
autodetected based on installed modules.

Note this change also removes the unnecessary "platform_api" statement
and comment as this is already handled in
framework-connectivity-test-defaults.

Bug: 317913702
Test: m, aapt dump badging, verify (min)sdkVersion=30, targetSdk=10000
Change-Id: I2267e5c9219f059872928cc681547c3bd5fbc394

Remi NGUYEN VAN   commited 2024-02-14 18:13:35 +09:00
4a01ecf7e0
[automerger skipped] Merge "Include FlaggedApi.bp" into main am: e9e28ce2b4 -s ours
am skip reason: Merged-In I4ef7eff6567b848c8cfa52c51c734642ce929589 with SHA-1 212c54b344 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927450

Change-Id: I76476731a5a0605a6d65868418cd70241c25bdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2024-02-14 06:21:44 +00:00
78a00199eb
[automerger skipped] Include FlaggedApi.bp am: 98a7630a1f -s ours
am skip reason: Merged-In I4ef7eff6567b848c8cfa52c51c734642ce929589 with SHA-1 212c54b344 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927450

Change-Id: I6ae67ef897e1fccc649f5c53179bf2351672df62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2024-02-14 06:21:39 +00:00
e245c0efd0
Merge "Include FlaggedApi.bp" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2024-02-14 05:48:26 +00:00
e9e28ce2b4
CTS for default background network restrictions
Apps will now lose network access once they are in top-sleeping or
higher process state. Adding some cts tests to ensure correct behavior.

The tests are using temporarily using junit Assume to skip if the
feature flag is enabled to enable a following code migration.

Test: atest CtsHostsideNetworkTests

BYPASS_INCLUSIVE_LANGUAGE_REASON=Existing method

Bug: 304347838
Change-Id: Iba7c7bd01309fa7a301fdc1524033f0fad5ae512

Suprabh Shukla   commited 2024-02-13 17:08:10 -08:00
b2e574d4b8
Merge "Define the IpSecTransformState API flag in Connectivity module" into main am: dc800d0020
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2959188

Change-Id: I981d53d1ace0cc55cefb5f7ecedd584ff934c774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-02-13 23:03:10 +00:00
47bedb3d89