Commit graph

97,456 commits

Message SHA1
Support bringing up restricted wifi am: 7cabd32bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2917645

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

Ying Xu   authored and   Automerger Merge Worker   commited 2024-02-07 16:01:47 +00:00
0a53aec0b4
Merge "Expose NET_CAPABILITY_LOCAL_NETWORK as public API" into main am: 54aaccc1c9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2867894

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

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2024-02-07 12:54:08 +00:00
6ad9f52677
Support bringing up restricted wifi
This CL allows the Carrier Config app to request restricted WiFi nework
by setting the correspoding subscription ID in the network request.

Bug: 315835605
Test: atest android.net.cts.NetworkRequestTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.CarrierPrivilegeAuthenticatorTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest

Change-Id: I237e692d092ff5f969ce4b7962f6d58099a6f3a9

Ying Xu   commited 2024-02-07 04:24:38 -08:00
7cabd32bc5
Merge "Expose NET_CAPABILITY_LOCAL_NETWORK as public API" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2024-02-07 12:19:07 +00:00
54aaccc1c9
Merge "Adds API test coverage for OffloadServiceInfo" into main am: 872a8ad788
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2946953

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

Yuyang Huang   authored and   Automerger Merge Worker   commited 2024-02-07 09:23:53 +00:00
5e01e9a94c
Merge "Adds API test coverage for OffloadServiceInfo" into main
Yuyang Huang   authored and   Gerrit Code Review   commited 2024-02-07 08:51:38 +00:00
872a8ad788
Expose NET_CAPABILITY_LOCAL_NETWORK as public API
Apps that target an SDK before {@link Build.VERSION_CODES.VANILLA_ICE_CREAM}
will not see networks with this capability unless they explicitly set the
NET_CAPABILITY_LOCAL_NETWORK in their NetworkRequests.

In this way, `NET_CAPABILITY_LOCAL_NETWORK` should be public.

Bug: 313000440
Test: None
Change-Id: I44d9cf3ecf5da471a627696f3d2680f35d4b122d

Handa Wang   authored and   Motomu Utsumi   commited 2024-02-07 17:23:42 +09:00
21005edfdf
Merge "Replace use of deprecated logging functions" into main am: b8ad2428d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2946807

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

Jeffrey Vander Stoep   authored and   Automerger Merge Worker   commited 2024-02-06 09:54:35 +00:00
5a71f5128b
Merge "Replace use of deprecated logging functions" into main
Jeffrey Vander Stoep   authored and   Gerrit Code Review   commited 2024-02-06 08:58:17 +00:00
b8ad2428d0
Merge "Set the container field of aconfig flags" into main am: 108a2d6360
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2949209

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

Oriol Prieto Gascó   authored and   Automerger Merge Worker   commited 2024-02-06 01:12:21 +00:00
2b080e4071
Merge "Set the container field of aconfig flags" into main
Oriol Prieto Gascó   authored and   Gerrit Code Review   commited 2024-02-06 00:38:23 +00:00
108a2d6360
[Thread] check too large error code in unit tests am: 54d62cee14
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2950125

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-02-05 12:05:33 +00:00
0593c2ef96
[Thread] check too large error code in unit tests
Per CTS review comment in aosp/2949385:
```
You might want to make this a bit larger, otherwise if some new error codes are added in the future in a mainline update, already released CTS test packages will start to fail.

That should be fixed by mCTS, but since mCTS is not in place yet, it's best to be safe
```

This commit moves the too-large error code check into unit test to avoid
potential CTS compatibility issues.

Bug: 323791003
Change-Id: If99191630e1044cb8f5ed189bf79567cd51c3905

Kangping Dong   commited 2024-02-05 15:53:43 +08:00
54d62cee14
Replace use of deprecated logging functions
This is needed to upgrade the android_logger crate from 0.12.0
to 0.13.3.

with_max_level provides the same functionality as with_min_level.
The renaming is admittedly confusing, but the new name is accurate
and it makes sense that they deprecated and then removed the
previously poorly named with_min_level.

See crate documentation [1] and code [2].

[1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level
[2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227

Bug: 322718401
Test: build and run CF with the change.
Test: m aosp_cf_x86_64_phone
Change-Id: Icbfe09b864ce3d52953bf93ca98b7a2db0990e68

Jeff Vander Stoep   commited 2024-02-05 07:47:42 +01:00
a47ea30e0b
Merge "[Thread] add CTS tests for ThreadNetworkException" into main am: 2fe1db6e49
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2949385

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-02-04 10:19:30 +00:00
cffd5d0f48
Merge "[Thread] add CTS tests for ThreadNetworkException" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2024-02-04 09:58:33 +00:00
2fe1db6e49
Merge "[mdns] implement NsdPublisher AIDL service" into main am: addabc4729
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890959

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-02-04 05:57:18 +00:00
fb9a1abdf9
Merge "[mdns] implement NsdPublisher AIDL service" into main
Handa Wang   authored and   Gerrit Code Review   commited 2024-02-04 05:23:14 +00:00
addabc4729
[Thread] add CTS tests for ThreadNetworkException
Bug: 323464130
Test: presubmit
Change-Id: I67bde1506e99b42ff3806254aa8bbc6c98792e3e

Kangping Dong   commited 2024-02-04 12:58:10 +08:00
86a70b4992
[mdns] implement NsdPublisher AIDL service
For ot-daemon to perform mDNS operations, we need to implement an AIDL
service NsdPublisher. MdnsPublisher forwards the calls to NsdManager.

For now, only register & unregster a service without a custom host is supported.

Bug: 320211657
Bug: 318323473
Test: atest CtsThreadNetworkTestCases

Change-Id: Ia392a0f57046f53973ac6bd6043dec915d170666

Handa Wang   commited 2024-02-04 04:03:36 +00:00
0c99448af4
Set the container field of aconfig flags
Test: m
Bug: 312769710
Change-Id: I1eed7982b40d28947aa3f9575c568eac325dc832

Oriol Prieto Gasco   commited 2024-02-03 02:39:14 +00:00
6eec17aa97
Adds API test coverage for OffloadServiceInfo
Bug: 323464655
Bug: 323464223
Test: TH
Change-Id: I23e8fb702b569869f0fa76807fb689873de13e54

Yuyang Huang   commited 2024-02-03 07:43:53 +09:00
a8f2081258
Merge "Remove strict_updatability_linting: true" into main am: 1042c175a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927772

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

Cole Faust   authored and   Automerger Merge Worker   commited 2024-02-02 19:04:41 +00:00
4b6228e008
Merge "Remove strict_updatability_linting: true" into main
Cole Faust   authored and   Gerrit Code Review   commited 2024-02-02 18:21:10 +00:00
1042c175a0
Merge "Rename check*Permission* to has*Permission" into main am: ef58a8a33a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2942985

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2024-02-02 07:39:51 +00:00
ed63f37f7d
Merge "Rename check*Permission* to has*Permission" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2024-02-02 07:07:31 +00:00
ef58a8a33a
Merge "Increase max metrics duration deviation to 2 hours" into main am: 84cc4e507e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939460

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

Hansen Kurli   authored and   Automerger Merge Worker   commited 2024-02-02 05:52:12 +00:00
fcb49c63a6
Merge "Increase max metrics duration deviation to 2 hours" into main
Hansen Kurli   authored and   Gerrit Code Review   commited 2024-02-02 05:29:54 +00:00
84cc4e507e
Merge "[Thread] restarts when ot-daemon crashes" into main am: fbaa7ea0bc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2940286

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-02-01 15:56:21 +00:00
4674f54725
Merge "[Thread] restarts when ot-daemon crashes" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2024-02-01 15:24:26 +00:00
fbaa7ea0bc
[Thread] restarts when ot-daemon crashes
This commit handles the ot-daemon crash by automatically restarting it
and rejoin the network if ever joined.

This also fixes the address not deleted issue in TunInterfaceContorller.

Bug: 321540728
Bug: 309792480
Change-Id: I3ed466eb70818974a1e57f01456363bdf82915d5

Kangping Dong   commited 2024-02-01 21:49:31 +08:00
3deddc7b3f
Merge "Initialize serviceCache before first use" into main am: 1e2aa90e38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2942990

Change-Id: I7850edefd048d130840b730d821358e9f83bd75b
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-01 09:56:37 +00:00
3d41ca8aeb
Merge "Initialize serviceCache before first use" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-01 09:20:04 +00:00
1e2aa90e38
Initialize serviceCache before first use
The comment that "The very first posted task is to initialize the
service cache, so it will be always set in other tasks running on
the handler" did not consider that if the looper was provided by the
caller, it is possible for other tasks to run on it before the
serviceCache is initialized. In particular, if the caller calls
registerListener on the looper thread right after calling the
constructor, this would be executed before the posted initialization
task.

In practice this does not happen as MdnsDiscoveryManager is created in
the NsdService constructor, and any usage of it is on messages posted to
the NsdService handler thread after the constructor has been called; so
the service cache initialization does happen before any other
MdnsDiscoveryManager task.

As this is error-prone, just initialize the service cache before first
use on the handler thread, as it is only used for
createServiceTypeClient, which runs on the handler thread.

Test: atest
Change-Id: Ie341bb71ef327dceb4f0aa6fc2d241d6e9cbb900

Remi NGUYEN VAN   commited 2024-02-01 16:51:56 +09:00
578e0dc608
Merge "Fix querying of multiple subtypes" into main am: 742588457a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939001

Change-Id: I01aaf966c5ea7eeb059371418d10ed4f7edcbe06
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-01 07:50:40 +00:00
e9d900f72d
Merge "Fix querying of multiple subtypes" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-01 07:25:40 +00:00
742588457a
Rename check*Permission* to has*Permission
The check*Permission methods are a bit error-prone because people
can forget to check the return value and expect that they behave
like the enforce* methods. This was pointed out before in some bugs.

This change adds @CheckResult annotation to enforce linter warning
and rename methods accordingly.

Test: TH
Fix: 279691948
Change-Id: Ibb0df6540fe0ed40289bb190b790130daaa2f763

Junyu Lai   commited 2024-02-01 15:24:35 +08:00
71b5153898
Merge "Do not block for HandlerThread start" into main am: b68837ea09
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2931455

Change-Id: Ia75795afb682dc39abf7e9e62f8e0cf7c0f6d1f2
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-01 05:58:30 +00:00
10aa0b53bd
Merge "Do not block for HandlerThread start" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-01 05:50:50 +00:00
b68837ea09
Add netlinkSocketForProto() without buffersize. am: 1d8b7cc422
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2942526

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

Yang Sun   authored and   Automerger Merge Worker   commited 2024-02-01 05:44:55 +00:00
5d65631bf0
Do not block for HandlerThread start
Instead of calling HandlerThread#getLooper immediately after starting
it, do it asynchronously in onLooperPrepared.

getLooper blocks until the looper is ready, which may take a significant
amount of time.

This involves queueing tasks until the looper is ready, so the thread
selection logic is refactored to a dedicated class.

Test: atest
Change-Id: I0444bffe8e4bb4e3f29bd0271c7b24bc46a62cf6

Remi NGUYEN VAN   commited 2024-02-01 11:56:32 +09:00
97d28b3dfa
Add netlinkSocketForProto() without buffersize.
Test: atest NetworkStaticLibTests
atest FrameworksNetTests

Change-Id: I34a0a29eb7e78490701872229585e61f7a0c1dd3

Yang Sun   commited 2024-02-01 09:50:52 +08:00
1d8b7cc422
Merge "netbpfload: enable mainline on API V/35+" into main am: 9128ac317d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2804514

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2024-02-01 01:30:07 +00:00
796acb075b
Merge "netbpfload: enable mainline on API V/35+" into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2024-02-01 01:00:10 +00:00
9128ac317d
[automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: e7aa45cdf0 -s ours
am skip reason: Merged-In I243f17b3f0ad7af9ffa15ca242456e36688733f5 with SHA-1 985604c94f is already in history

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

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-02-01 00:04:41 +00:00
a61a30ca2a
[automerger skipped] [DON'T BLOCK] Test ownership migration rules am: 01b5ede2b2 -s ours
am skip reason: Merged-In I243f17b3f0ad7af9ffa15ca242456e36688733f5 with SHA-1 985604c94f is already in history

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

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

Aditya Choudhary   authored and   Automerger Merge Worker   commited 2024-02-01 00:04:35 +00:00
c12622b330
Merge "[DON'T BLOCK] Test ownership migration rules" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-01-31 23:38:03 +00:00
e7aa45cdf0
netbpfload: enable mainline on API V/35+
netbpfload.mainline.rc is derived from:
  initrc-doc/bpfloader-sdk34-14-U.rc,
except that it is 'override' instead of 'updatable' and uses
the apex netbpfload instead of the platform bpfloader.

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

Maciej Żenczykowski   commited 2024-01-31 22:36:39 +00:00
041be52b08
Merge "[DON'T BLOCK] Test ownership migration rules" into udc-mainline-prod
Aditya Choudhary   authored and   Android (Google) Code Review   commited 2024-01-31 21:59:48 +00:00
36ad3cf173
Merge "Add CtsConnectivityMultiDevicesTestCases for hotspot" into main am: 9c3c120c6c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2891012

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2024-01-31 14:56:42 +00:00
905e203103