Commit graph android_packages_modules_Co.../service
Message SHA1
Merge "Support network slicing permission check in multi-user environment" into main am: 38f871c8e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849536

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-12-07 12:49:47 +00:00
8acc788f4a
Merge "Support network slicing permission check in multi-user environment" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-12-07 12:32:18 +00:00
38f871c8e0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
Bill Yi   authored and   Android (Google) Code Review   commited 2023-12-07 00:11:36 +00:00
ed00082d06
Merge "Revert canSeeAllowedUids for ownerUid" into main am: 6f95ab2558
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854709

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

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2023-12-06 06:27:37 +00:00
fbbcef0a66
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1c23a40d07f8a42d59aa691ee4faabcec7a19b5

Bill Yi   commited 2023-12-05 15:41:04 -08:00
b52d1d9c79
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
Bill Yi   authored and   Android (Google) Code Review   commited 2023-11-30 18:09:13 +00:00
604d8d74eb
Revert canSeeAllowedUids for ownerUid
aosp/2405720 allowed network owner uid to see allowed uids
But this breaked old cts.
This CL reverts the behavior for network owner uid.

Bug: 312093253
Bug: 313025186
Bug: 312196228
Test: TH
Change-Id: Iaa732d22f67ecce7678e68bb8b20cec526116dc9

Motomu Utsumi   commited 2023-12-01 00:45:14 +09:00
eb4a1968ef
Merge "Log bpf rc file if it differs from the template files." into main am: 8670809d7f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849354

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

Yuyang Huang   authored and   Automerger Merge Worker   commited 2023-11-30 03:55:03 +00:00
067ec832af
Merge "Revert "Include both eth%d and usb%d ethernet interfaces on U+"" into main am: 783035bdfe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2851331

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2023-11-30 03:54:51 +00:00
c57687f21c
Merge "Log bpf rc file if it differs from the template files." into main
Yuyang Huang   authored and   Gerrit Code Review   commited 2023-11-30 03:32:56 +00:00
8670809d7f
Merge "Revert "Include both eth%d and usb%d ethernet interfaces on U+"" into main
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2023-11-30 03:20:39 +00:00
783035bdfe
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib82fc967f893becf8dab16f0b05a6518819c8af8

Bill Yi   commited 2023-11-29 14:50:00 -08:00
83c7a9728c
Revert "Include both eth%d and usb%d ethernet interfaces on U+"
This reverts commit 11eac8e12b.

Reason for revert: there are devices in the field using usbX interfaces for tethering

Change-Id: I7bbcbb703294de1c9dd3e0390bc8ad28aa350ef6

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2023-11-29 11:09:44 +00:00
ac6ff00b83
Log bpf rc file if it differs from the template files.
Check if the bpf loader rc file is differs from the template files when
ConnectivityService starts. Use Log.wtf() to log the file if there is a
diff.

Bug: 312638861
Test: TH
Change-Id: I0b9ed9962ad0954a051a17b01357d04a0e655ff4

Yuyang Huang   commited 2023-11-29 19:58:15 +09:00
41557553f6
Merge "Replace useTls with mode in PrivateDnsConfig" into main am: 452feb2620
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842798

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

Mike Yu   authored and   Automerger Merge Worker   commited 2023-11-29 02:12:26 +00:00
d2f934a727
Support network slicing permission check in multi-user environment
In multi-user environment, the App might not be installed by system user.
As a result, the ConnectivityService should use the packageManager from
the user's context to be able to read the property correctly.

Bug: 300274339
Test: TH
Change-Id: I5398c95562bcaf5752270b52f38cca1f02698ba1

Yuyang Huang   commited 2023-11-28 16:54:49 +09:00
4c7deee859
Replace useTls with mode in PrivateDnsConfig
In PrivateDnsConfig class, `useTls` is replaced with `mode`.
This CL a corresponding change.

Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I60c53e52f287fc7fa05543603a62632d934bb2e6

Mike Yu   commited 2023-11-28 07:49:58 +00:00
9738b47758
Merge "Prompt user to add data on mobile portals" into main am: 5db2089717
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632310

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2023-11-27 03:35:16 +00:00
6fc0bfcf75
Merge "Prompt user to add data on mobile portals" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-11-27 02:45:14 +00:00
5db2089717
Merge "Revert "Prioritize non-slices over slices"" into main am: 11162e97c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840317

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-24 03:26:47 +00:00
6454939961
Merge "Revert "Prioritize non-slices over slices"" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-24 02:50:35 +00:00
11162e97c6
Prompt user to add data on mobile portals
On mobile networks it is more likely that the user needs to top up or
get a mobile data subscription, rather than "sign in" as the previous
messaging was suggesting.
Following feedback from interaction designers / UX writers, change the
strings to be more appropriate for the most common use-case.

Bug: 153673376
Test: atest FrameworksNetTests
      manual test on mobile network force-detecting a portal.
Change-Id: I5b4d4a17fd507d8cf3c9863cf23b5fedb258852e

Remi NGUYEN VAN   commited 2023-11-24 11:02:19 +09:00
3f2ff2e3d7
Merge "Update Andorid.bp to use DnsResolver v13" into main am: faa10d066b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452966

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

Mike Yu   authored and   Automerger Merge Worker   commited 2023-11-21 12:37:56 +00:00
aa8b19e205
Merge "Update Andorid.bp to use DnsResolver v13" into main
Mike Yu   authored and   Gerrit Code Review   commited 2023-11-21 12:04:30 +00:00
faa10d066b
Revert "Prioritize non-slices over slices"
This reverts commit 14499f0119.

Reason for revert: b/312408745

Change-Id: I8b03799fe6e0e256263240909ee7446c178bf508

Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-21 10:25:14 +00:00
6121a7656c
Merge changes I30f8814c,Ifdf67318,If312b8f8 into main am: 4a013c47c2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824211

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-20 07:27:47 +00:00
a067200ebd
Stop CarrierPrivilegeAuthenticator thread in tests am: 96ff954464
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814217

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

Chalard Jean   authored and   Automerger Merge Worker   commited 2023-11-20 07:27:34 +00:00
018b9ada56
Merge changes I30f8814c,Ifdf67318,If312b8f8 into main
* changes:
  Rename hasCarrierPrivilege... to isCarrierServiceUid...
  Detect discrepancies in subIds
  Allow carrier service UIDs to access their own WiFi networks.

Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-20 06:55:04 +00:00
4a013c47c2
Stop CarrierPrivilegeAuthenticator thread in tests
Bug: 308519360
Test: CarrierPrivilegeAuthenticatorTest
Change-Id: I59164be00a9e1fcced8538537c1dcabd214f2170

Chalard Jean   commited 2023-11-20 14:31:32 +09:00
96ff954464
Merge "Add more powerful CTS for allowedUids" into main am: 51c80a72d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405720

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-20 05:17:27 +00:00
bd402334a8
Rename hasCarrierPrivilege... to isCarrierServiceUid...
This method tests whether the UID is the carrier service
UID, not whether the UID has carrier privilege.

Note that in normal operation, the carrier service UID always
has carrier privilege.

Test: NetworkAgentTest
Change-Id: I30f8814cc0419a2d6bdbe75fdc82156516eba026

Chalard Jean   commited 2023-11-20 14:01:02 +09:00
8c63ed851f
Detect discrepancies in subIds
The subIds in network capabilities are stored both in
the network specifier (for telephony) or transportInfo (for
wifi), and in a separate field in NC, which are seeded
differently. These should in principle never diverge if there
is no bug in the network factories code, but since this code
is OEM-specific, it's very hard to know whether it's the case.

Historically CarrierPrivilegeAuthenticator has been using the
specifier / info to find out about the sub id, but reading
from NetworkCapabilities#getSubscriptionIds() would be both
nicer and more future-proof. Log a terrible failure in case
they differ, so we can confidently switch to the latter if
we don't see any such log.

Change-Id: Ifdf67318ceb881349e322591632c18a4dbf218e1
Test: NetworkAgentTest

Chalard Jean   commited 2023-11-20 14:01:02 +09:00
c43748297f
Allow carrier service UIDs to access their own WiFi networks.
Bug: 236669534
Test: New tests in this patch
Change-Id: If312b8f8359888558969c022811d6b203be602a0

Chalard Jean   commited 2023-11-20 14:01:02 +09:00
a093b452f3
Merge "Add more powerful CTS for allowedUids" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-20 04:44:22 +00:00
51c80a72d8
Add more powerful CTS for allowedUids
This tests that the network providers are subject to appropriate
limitations as to what they can set as allowedUids – both in the
positive (can do) case, and the negative (can't do) case.

Test: this
Change-Id: I115e2a4bc02ddcd03ecf2f35130fcb0378da22bd

Chalard Jean   commited 2023-11-20 12:16:39 +09:00
5301778ad8
Update Andorid.bp to use DnsResolver v13
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I92ab5e1eef7ba1715176e3628222084067d14603

Mike Yu   commited 2023-11-20 01:48:53 +00:00
d0ad17c2d1
Merge "Add an idea for how we could reduce the netId size in the future." into main am: 5fb3e6de24
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2831532

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2023-11-20 00:37:10 +00:00
95a928abfe
Merge "Add an idea for how we could reduce the netId size in the future." into main
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2023-11-20 00:09:15 +00:00
5fb3e6de24
Merge "Revert "Make PRIORITIZE_* networks non-default"" into main am: dec578072a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836091

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

Michał Brzeziński   authored and   Automerger Merge Worker   commited 2023-11-17 12:59:30 +00:00
fdd105d2c2
Merge "Revert "Make PRIORITIZE_* networks non-default"" into main
Michał Brzeziński   authored and   Gerrit Code Review   commited 2023-11-17 12:21:56 +00:00
dec578072a
Revert "Make PRIORITIZE_* networks non-default"
This reverts commit 30fb9b1ca4.

Reason for revert: Potential culprit for CtsLibcoreTestCases test failures b/311612650

Change-Id: Ie7de97159f92a174476a8fa8ea83e3e01914aea1

Michał Brzeziński   authored and   Gerrit Code Review   commited 2023-11-17 11:18:56 +00:00
05cba24cd8
Merge "Make PRIORITIZE_* networks non-default" into main am: 9a5252ba50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2761506

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-17 06:13:32 +00:00
75c7d92ba6
Merge "Make PRIORITIZE_* networks non-default" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-17 05:55:22 +00:00
9a5252ba50
Make PRIORITIZE_* networks non-default
As a specialized network, a network with PRIORITIZE_* is not
generally a good default network, and might cause unexpected
charges if allowed to become one.

Test: CSDefaultNetworkTests
Change-Id: I8f7184f80bb987da720bd067862bd7a546a38e26

Chalard Jean   commited 2023-11-16 18:45:10 +09:00
30fb9b1ca4
Merge "Apply forwarding rules before sending onAvailable" into main am: 6eee1859f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2832492

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-16 09:22:25 +00:00
5bd327293a
Merge "Apply forwarding rules before sending onAvailable" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-16 09:05:37 +00:00
6eee1859f4
Merge "suppress unguarded-availability warning for only AServiceManager_waitForService" into main am: eb08e8cdc8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2822790

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2023-11-16 09:05:23 +00:00
a3af048f7f
Merge "suppress unguarded-availability warning for only AServiceManager_waitForService" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2023-11-16 08:35:30 +00:00
eb08e8cdc8
Apply forwarding rules before sending onAvailable
Ideally the rules should be set up before onAvailable is
sent, but onLocalNetworkChanged should be sent after.

The previous code had CSLocalAgentTests#testForwardingRules
flaky because it was waiting for onAvailable and immediately
checking that the routing rules have been set up.

There are other ways to fix this flake (e.g. wait for
onLocalNetworkChange in the test or add a timeout on
the verify(netd) call) but this patch probably implements
the best production code behavior.

Bug: 309688089
Test: CSLocalAgentTests#testForwardingRules 1'000 times
      Before this patch : flakes after 50~200 iterations
      After this patch : no flake in 1'000 iterations
Change-Id: I4dcccaa3607c1e28aa89f268f0c721d87b1e9466

Chalard Jean   commited 2023-11-16 17:04:15 +09:00
68eab721fc
Merge "Pass VPN uid range to AutomaticOnOffKeepaliveTracker" into main am: 9481063d42
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2831531

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-11-16 02:00:04 +00:00
5c22f66fb2