LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,672 Commits 2 Branches 0 Tags
dbf8d3025e55ba8eb1c5c9899c7c2d9f98ff302c
Commit Graph

92672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
f3fe3333d3 Add expired services removal flag 
The TTL check and removal of expired services is currently only
performed when a mDNS query is sent. This can result in expired
services remaining in the cache if no queries are sent. To
address this, the remaining TTL will be checked when retrieving
services from the MdnsServiceCache. Add a new flag to enable
the expired services removal feature. This feature will be
implemented in subsequent changes.

Bug: 265787401
Bug: 304649384
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I30f0eea568ee45d363cc02821de0921d6040f981
 2023-10-18 17:48:46 +08:00
Junyu Lai
452e464ee9 Support shell command to get bpf program id 
Test: atest NetworkStatsIntegrationTest#testBpfProgramAttachStatus
Bug: 292156770

Change-Id: I815be0f3f3592442939872f98e3ad9d224a6aeb6
 2023-10-18 16:06:15 +08:00
Junyu Lai
155760b57b Dump bpf program status in dumpsys 
Sample output:
Bpf Program Status:
  CGROUP_INET_INGRESS: 21
  CGROUP_INET_EGRESS: 22
  CGROUP_INET_SOCK_CREATE: 28
  CGROUP_INET4_BIND: 30
  CGROUP_INET6_BIND: 31

Test: adb shell dumpsys connectivity
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest#testDumpDoesNotCrash
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest#testDumpDoesNotCrash
Bug: 292156770
Change-Id: I312c90c524af12d093536156d6d5c6febd64305a
 2023-10-18 16:05:55 +08:00
Chalard Jean
7f2b3dabcd Reapply "Simplify addRoutesToLocalNetwork calls" 
This reverts commit 316346be6e.

Change-Id: I86977f6e7a5451d037c7ea6fee5c4bc7082935ff
 2023-10-18 15:50:02 +09:00
Chalard Jean
f9d0e3e94f Reapply "Add LocalNetworkConfig" 
This reverts commit 6eea22b18c.

Change-Id: I0a2cef4ee992577674c92ecd384dc6f4361afa02
 2023-10-18 15:50:02 +09:00
Junyu Lai
82ead24719 Merge "Respect SkipPresubmit annotation for ConnectivityCoverageTests" into main am: 8cefcdc1b2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2792413

Change-Id: Ida09f7d3a9c339f419376279b2c52c6d91649c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 06:20:08 +00:00
Junyu Lai
8cefcdc1b2 Merge "Respect SkipPresubmit annotation for ConnectivityCoverageTests" into main 2023-10-18 05:16:13 +00:00
Jean Chalard
1a127b05ea Merge "Reapply "Tell netd about local networks"" into main am: de0f4e5b87 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2792435

Change-Id: I33c0d6e79f579764d8cd51690c0fdbf18cc3f21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 13:34:09 +00:00
Jean Chalard
de0f4e5b87 Merge "Reapply "Tell netd about local networks"" into main 2023-10-17 13:00:46 +00:00
Junyu Lai
c58926b4ec Merge "Move dumpsys to handler thread" into main am: 5606bba1f9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2785999

Change-Id: I5bd9aae3c84ac49d214d8615a1416a7e0744e931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 11:38:16 +00:00
Junyu Lai
5606bba1f9 Merge "Move dumpsys to handler thread" into main 2023-10-17 11:08:19 +00:00
Junyu Lai
86298be5f8 Respect SkipPresubmit annotation for ConnectivityCoverageTests 
Follow-up from aosp/2788197, the CL does not work since
SkipPresubmit annotation is not excluded from TEST_MAPPING for
ConnectivityCoverageTests.

Test: TH
Bug: 302325928
Change-Id: I2d953f19e5d5eb5f5d8fdf4faf335d603bae42a0
 2023-10-17 17:25:10 +08:00
Junyu Lai
f8dba342f1 Move dumpsys to handler thread 
I0afdda023208c3f8620cb5b89add66448af596d7 added some assertions
to ensure NetworkAgentInfo can only be accessed from the handler
thread. This is good to eliminate any potential concurrent
accessing problem. Howver, dumpsys runs on binder thread, this
change breaks dumpsys functionality.

Thus, this change:
  1. Copy Handler#runWithScissors() and related class
     locally since they are @hide methods.
  2. Run doDump on the handler thread and waits for return.

Test: adb shell dumpsys connectivity
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.HandlerUtilsTest
Fix: 303348620
Change-Id: Ic3a22f5d370bbf8c18b1972e86d695b6ad61bd0d
 2023-10-17 17:16:04 +08:00
Chalard Jean
e0aaca5ac6 Reapply "Tell netd about local networks" 
This reverts commit cc409153b4.

Change-Id: Ied6bdb9b94e08e2bfe1092765d0f4591e603c3eb
 2023-10-17 17:39:23 +09:00
Junyu Lai
6d0bdd197a Add synchronized block when accessing global variables 
This is catched by errorprone where global variables accessing
is not protected by the declared lock, which could lead to a
potiential race problem where these variables are changed but
cannot be seen for the invocation.

This is also safe since:
  1. The method called inside mDefaultNetworks is already holding
     the same lock.
  2. Multiple global variables are protected by this synchronized
     block.

Test: TH
Fix: 181642673
Change-Id: I58e7f124de1f0291e9323ab0b9cf8f52cec32818
 2023-10-17 15:03:17 +08:00
Xinyi Zhou
61374ef6a4 Merge "[nearby] Fix test failure" into udc-mainline-prod 2023-10-17 03:52:18 +00:00
Paul Hu
a55920ca69 Merge "Include A/AAAA records in probing packet" into main am: 4479bd9f27 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2739333

Change-Id: Idc31dd8f93df533c2d6b514ceafc026f2918d34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 02:55:04 +00:00
Paul Hu
4479bd9f27 Merge "Include A/AAAA records in probing packet" into main 2023-10-17 02:24:10 +00:00
Xinyi Zhou
f6fdf4cf7b [nearby] Fix test failure 
Test: -m
Fix: 303338703
Change-Id: I7048917f5345f55364626901b533fee3d3856bf7
Ignore-AOSP-First: nearby not in aosp yet
 2023-10-16 16:25:04 -07:00
Patrick Rohr
993f28cfb4 Merge "Disable flaky NetworkStatsHistoryTest#testFuzzing in presubmit" into main am: bc17f31426 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2788197

Change-Id: I0c63bb7d73ddbe5cc30e162a14a8cb7dcebe9908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 22:35:57 +00:00
Patrick Rohr
bc17f31426 Merge "Disable flaky NetworkStatsHistoryTest#testFuzzing in presubmit" into main 2023-10-16 22:06:40 +00:00
Maciej Żenczykowski
f36ccc75de tethering apex: add ethtool binary 
Afterwards:
  vsoc_x86:/ # ls -lZ /apex/com.android.tethering/bin/ethtool
  -rwxr-xr-x 1 root shell u:object_r:system_file:s0  96204 1969-12-31 16:00 /apex/com.android.tethering/bin/ethtool

  vsoc_x86:/ # ldd /apex/com.android.tethering/bin/ethtool
  linux-gate.so.1 => [vdso] (0xedc4d000)
  libc++.so => /apex/com.android.tethering/lib/libc++.so (0xed309000)
  libc.so => /apex/com.android.runtime/lib/bionic/libc.so (0xed3db000)
  libdl.so => /apex/com.android.runtime/lib/bionic/libdl.so (0xed2c3000)
  libm.so => /apex/com.android.runtime/lib/bionic/libm.so (0xed286000)

Apex-Size-Increase: (verify ~100kB)
Aosp-First: it is
Previous-Platform-Support: been debug only for a while
Test-Info: builds, boots, binary works
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1f7d12f2df2cf26476634e7eb84ca8f7622905f4
 2023-10-16 17:43:59 +00:00
Hansen Kurli
a0cca02515 Add tests for onUserAdded and onUserRemoved 
Test coverage of adding and removing a restricted user with and
without lockdown mode, using either setLockdown() and
setAlwaysOnPackage().

This change also refactors makeVpnUidRange() to return a list
and adds makeVpnUidRangeSet().

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: I47a25e9f0337f5c1d5754c279534640cd2753b5c
 2023-10-16 18:11:41 +08:00
Hansen Kurli
de0eeb2ee4 Merge changes Ib7883f8a,I91ec59f7 into main am: 6f3e8aa4a0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2757367

Change-Id: I06c64d762d0242506ec543f1acf1cb082ccb36db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 09:26:10 +00:00
Junyu Lai
09ac34db85 Disable flaky NetworkStatsHistoryTest#testFuzzing in presubmit 
Root cause not yet located, disable test to unblock TH.

Test: atest ConnectivityCoverageTests:android.net.connectivity.android.net.NetworkStatsHistoryTest
Bug: 302325928
Change-Id: I618090b67e428ab911ec88e7daab30c14cccbf64
 2023-10-16 17:21:06 +08:00
Hansen Kurli
6f3e8aa4a0 Merge changes Ib7883f8a,I91ec59f7 into main 
* changes:
  Mock Vpn.setUnderlyingNetworks()
  Mock Vpn.setLockdown()
 2023-10-16 09:04:22 +00:00
Motomu Utsumi
7a4fb1962c [automerger skipped] Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest am: 844ae9e435 -s ours 
am skip reason: Merged-In Iad740804a59599dd33add1ea85aa4771e0e4bd35 with SHA-1 aa2f4d839e is already in history

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

Change-Id: I62000acfbbe16083dd4b52bba1fab941e10c27e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 07:17:10 +00:00
Junyu Lai
16e8b3b3de Merge changes If7cb1cbb,I1d09ac01 into main am: e5c0a0fe56 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749823

Change-Id: I8d8c2da425adcbb63266074412145a86c6831d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 07:15:11 +00:00
Junyu Lai
e5c0a0fe56 Merge changes If7cb1cbb,I1d09ac01 into main 
* changes:
  Adds more data points for benchmarking tests
  Move test zip file to assets
 2023-10-16 06:50:12 +00:00
Paul Hu
68e67f44c3 Merge "Add ServiceExpiredCallback" into main am: 1eeeb15f2e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787872

Change-Id: I3ac1a65985a9e7608557803b2d36cd4b6a0410b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 02:19:53 +00:00
Paul Hu
1eeeb15f2e Merge "Add ServiceExpiredCallback" into main 2023-10-16 01:41:49 +00:00
Anton Kulakov
fb9169d923 Merge changes from topic "revert-2777667-BKWNXIZQME" into main am: 18d14d3e78 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786126

Change-Id: Ib00efdc8df8d72ceb1a83f0726ee3956b287a778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-14 08:58:49 +00:00
Anton Kulakov
5306f666fb Revert "Add LocalNetworkConfig" am: 6eea22b18c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786125

Change-Id: Ia711af732a95933636b99c3d7e44ae8170dcb67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-14 08:58:46 +00:00
Anton Kulakov
0c22e7e12a Merge "Revert "Simplify addRoutesToLocalNetwork calls"" into main am: 673d97b919 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786124

Change-Id: If4e8fc92ae92fb7356dcaca234404a94c0be49a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-14 08:58:42 +00:00
Anton Kulakov
18d14d3e78 Merge changes from topic "revert-2777667-BKWNXIZQME" into main 
* changes:
  Revert "Tell netd about local networks"
  Revert "Add LocalNetworkConfig"
 2023-10-14 08:19:27 +00:00
Anton Kulakov
673d97b919 Merge "Revert "Simplify addRoutesToLocalNetwork calls"" into main 2023-10-14 08:19:27 +00:00
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
Treehugger Robot
46305cbb63 Merge "Add additional overriding methods to signature files" into main am: d2d3b5dd88 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745461

Change-Id: I6244b3fcdfd638132d5010fa46f8783db03f07c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 15:38:15 +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
Anton Kulakov
cc409153b4 Revert "Tell netd about local networks" 
Revert submission 2777667

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495

Reverted changes: /q/submissionid:2777667

Bug: 305187495

Change-Id: Icb46558d17b56f9f6fd402f1489de9ed2b8f7644
 2023-10-13 15:23:59 +00:00
Anton Kulakov
6eea22b18c Revert "Add LocalNetworkConfig" 
Revert submission 2777667

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495

Reverted changes: /q/submissionid:2777667

Bug: 305187495

Change-Id: Iae4ef936a4c111ae5668e539ce4cdbbb14c811f4
 2023-10-13 15:18:55 +00:00
Anton Kulakov
316346be6e Revert "Simplify addRoutesToLocalNetwork calls" 
Revert submission 2777667

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495

Reverted changes: /q/submissionid:2777667

Bug: 305187495

Change-Id: I516d40b20d775e9c61b2f825bc094329d016d0c3
 2023-10-13 15:15:50 +00:00
Treehugger Robot
d2d3b5dd88 Merge "Add additional overriding methods to signature files" into main 2023-10-13 15:05:40 +00:00
Jean Chalard
3f837cf542 Merge changes I3b6ee1db,I70e13303,I6fb7dfe4 into main am: a6190bd658 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777667

Change-Id: I7c0aa8c8fff902b8585e5c09b1d571de70740f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 10:23:19 +00:00
Jean Chalard
a6190bd658 Merge changes I3b6ee1db,I70e13303,I6fb7dfe4 into main 
* changes:
  Simplify addRoutesToLocalNetwork calls
  Add LocalNetworkConfig
  Tell netd about local networks
 2023-10-13 09:57:18 +00:00
Paul Hu
d4dcb4bee8 Add ServiceExpiredCallback 
This is a no-op change and refactors the design for subsequent
TTL expiration check changes.
- Add a ServiceExpiredCallback to notify expired services.
- To simplify the design, pass the CacheKey to MdnsServiceCache
  methods instead.

Bug: 265787401
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I930a4f7baf9b8d3d0037dc6aefd717dbdd486520
 2023-10-13 16:45:31 +08:00
Paul Duffin
ec71811f1f Merge "Add additional overriding methods to signature files" into udc-mainline-prod 2023-10-13 08:23:22 +00:00
Hansen Kurli
233ac9463b Mock Vpn.setUnderlyingNetworks() 
Override Vpn.setUnderlyingNetworks() to do a direct call on the
network agent instead of relying on the Vpn class.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Ib7883f8a81a22317616cae79ce57a30afdd2bed4
 2023-10-13 15:37:08 +08:00
Hansen Kurli
39654c33cf Mock Vpn.setLockdown() 
Call setRequireVpnForUids directly to enable lockdown instead of
calling the real Vpn method.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: I91ec59f7542d145e9250a7e7a414593db3d99424
 2023-10-13 15:30:43 +08:00