Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
Merge "Add aggressive query mode" into main am: b4fba147cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2874718

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

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-30 08:02:09 +00:00
2879f398ec
Merge "Add aggressive query mode" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-30 07:37:41 +00:00
b4fba147cd
Add aggressive query mode
The current query scan modes, active and passive, have
limitations. Unicast queries only originate from the first query
session, multicast queries should be sent simultaneously with
unicast, and both modes suffer from infrequent scans. To
address these shortcomings, a aggressive query mode is proposed.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: I87100e03a5b6306dcae79f05c034f000e6dc2889

Paul Hu   commited 2024-01-30 03:34:11 +00:00
11a883dc92
Merge "Enforce package name belongs to the caller's uid" into udc-mainline-prod
Junyu Lai   authored and   Android (Google) Code Review   commited 2024-01-30 02:20:49 +00:00
2e7e2e81ad
Merge changes from topic "nsd-custom-host" into main am: a90737dc23
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890958

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-29 08:53:14 +00:00
eb86a13e5b
Merge "Use an integer for query mode" into main am: 22827c3814
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2929831

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

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-29 08:52:55 +00:00
ea36a162b8
Merge changes from topic "nsd-custom-host" into main
* changes:
  [mdns] service-side impl for custom host
  [mdns] add API support for custom hostname

Handa Wang   authored and   Gerrit Code Review   commited 2024-01-29 08:36:56 +00:00
a90737dc23
Merge "Use an integer for query mode" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-29 08:08:58 +00:00
22827c3814
[mdns] service-side impl for custom host
This CL adds the service-side implementation of the custom host support
added in aosp/2890957.

Bug: 284904661
Bug: 320838284
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I92c774ead4778870ff7358ccb28d6ad6e266f1b5

Handa Wang   commited 2024-01-29 06:46:43 +00:00
096e32e065
Use an integer for query mode
This is a no-op change. Currently, the query mode employs a
boolean value to toggle between passive and active modes. To
accommodate a broader range of query modes for different
requirements, switch to an integer value that facilitating
the addition of new modes more seamlessly.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: Ia9a12d4581246c3a5776cd241755a10994e32454

Paul Hu   commited 2024-01-29 06:19:24 +00:00
05086bde2d
Enforce package name belongs to the caller's uid
Ignore-AOSP-First: Security Fix
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Fix: 274443951
Fix: 243376076
Change-Id: I4ef7eff6567b848c8cfa52c51c734642ce929589

Junyu Lai   commited 2024-01-29 13:57:55 +08:00
212c54b344
clean up lint warnings am: ff474baf75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927114

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

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2024-01-27 02:41:31 +00:00
336ed95eb5
rename InterfaceMapUpdater to InterfaceMapHelper am: 9c82d9e693
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2925601

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

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2024-01-27 02:41:27 +00:00
845d660f06
remove BpfInterfaceMapUpdater async update functionality am: 8035dbc881
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2925600

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

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2024-01-27 02:41:23 +00:00
d4dd06101d
clean up lint warnings
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If51a297f4fd6b39584d08ed43816167becdc14c8

Maciej Å»enczykowski   commited 2024-01-26 15:24:19 -08:00
ff474baf75
rename InterfaceMapUpdater to InterfaceMapHelper
since it doesn't actually update any more...

Done via:
  git grep InterfaceMapUpdater | cut -d: -f1 | sort -u | while read i; do sed -i -r 's@InterfaceMapUpdater@InterfaceMapHelper@g' "$i"; done
  git mv ./tests/unit/java/com/android/server/net/BpfInterfaceMapUpdaterTest.java ./tests/unit/java/com/android/server/net/BpfInterfaceMapHelperTest.java
  git mv ./service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java ./service-t/src/com/android/server/net/BpfInterfaceMapHelper.java

Test: TreeHugger
  atest libnetworkstats_test
  atest FrameworksNetTests:android.net.connectivity.com.android.server.net.BpfInterfaceMapHelperTest
  atest NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
  atest --iterations=100 NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I07b57158347757f3f8dc4f24803a9bbf30445f7d

Maciej Å»enczykowski   commited 2024-01-26 15:24:19 -08:00
9c82d9e693
remove BpfInterfaceMapUpdater async update functionality
This is no longer needed due to being done synchronously via nativeRegisterIface()

Test: TreeHugger
  atest libnetworkstats_test
  atest NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
  atest FrameworksNetTests:android.net.connectivity.com.android.server.net.BpfInterfaceMapUpdaterTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9c0c79d23657fb5cb5296fb918f76f1fc896baa1

Maciej Å»enczykowski   commited 2024-01-26 15:24:19 -08:00
8035dbc881
Merge "Implement offload priority" into main am: 0b29cbf114
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2921267

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-01-25 06:13:53 +00:00
c88bf8ff88
Merge "Implement offload priority" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-01-25 06:09:19 +00:00
0b29cbf114
Merge "Support mDns Multipacket Known-Answer Suppression" into main am: eeb79c6937
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854586

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

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-25 03:44:29 +00:00
78ceed67b0
Merge "Support mDns Multipacket Known-Answer Suppression" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-25 03:00:45 +00:00
eeb79c6937
Merge "Add test for SkDestroyListener::dump()" into main am: c930f3e8e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2919647

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-24 12:03:03 +00:00
bc65a9e59f
Merge "Add test for SkDestroyListener::dump()" into main
Ken Chen   authored and   Gerrit Code Review   commited 2024-01-24 11:37:48 +00:00
c930f3e8e5
Support mDns Multipacket Known-Answer Suppression
When a query packet is truncated, the responder should defer
the generation of a response until all packets have been received
and processed. If an answer present in the query packet's answer
section also appears in the responder's response, and the
known-answer's TTL exceeds half of the original TTL, suppress
the corresponding response.

Bug: 312657709
Test: atest FrameworksNetTests NsdManagerTest
      Passed DISTRIBUTED DUPLICATE SUPPRESSION and \
      MULTIPLE QUESTIONS - DISTRIBUTED DUPLICATE SUPPRESSION \
      test cases of BCT
Change-Id: I781cd813d46f7d0db267f3fe23a15a81ae319e51

Paul Hu   commited 2024-01-24 08:54:58 +00:00
3aaa285293
Add test for SkDestroyListener::dump()
A simple unit test for the SkDestroyListener::dump().
(The follow-up of aosp/2916465)

Bug: 306919485
Bug: 319348954
Test: atest FrameworksNetTests:android.net.connectivity.com.android.serv
er.net.SkDestroyListenerTest

Change-Id: Ica70b2b344ffb2df8047cd936e8edc583e636ceb

Ken Chen   commited 2024-01-24 13:26:50 +08:00
8b33caa55e
Merge "Do not check active socket from other callbacks" into main am: 95d380fefd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2889939

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

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-24 03:54:07 +00:00
7a7942befd
Merge "Do not check active socket from other callbacks" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-24 03:15:16 +00:00
95d380fefd
Do not check active socket from other callbacks
Not all SocketTypeClients are cleaned up when their corresponding
sockets are closed. This occurs because the active socket check
for each callback examines the socket from all callbacks, even
those scheduled for removal in later notifications. To fix this,
check the active socket from the current callback only.

Fix: 317461509
Test: atest FrameworksNetTests NsdManagerTest
      Manually test with multiple discovery requests and
      Wifi on/off.
Change-Id: I2f81bb8e75f2c038d5e9dc025b208dcc6b441112

Paul Hu   commited 2024-01-23 10:31:08 +00:00
01d2f643be
Implement offload priority
Implement the TODO to assign priority to services based on an
overlayable configuration.

This changes the default priority from 0 to MAX_VALUE, as higher
priority values are less prioritized, so services not in the priority
list should have a high value. There is currently no user of the API
depending on the priority, so the change should not affect clients.

Test: atest
Change-Id: I3aae9b5fa7756de64c63974c192e4c96b632ce4e

Remi NGUYEN VAN   commited 2024-01-23 19:03:55 +09:00
5c9d6cbf16
Merge "Add SkDestroyListener log in dumpsys netstats" into main am: 65b4c3f0f1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916465

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-22 11:00:25 +00:00
4ad7f38739
Merge "Add SkDestroyListener log in dumpsys netstats" into main
Ken Chen   authored and   Gerrit Code Review   commited 2024-01-22 10:25:50 +00:00
65b4c3f0f1
Add SkDestroyListener log in dumpsys netstats
When sockets are destroyed, the SkDestroyListener receives a
NETLINK_INET_DIAG message informing it to delete the socket cookie from
the BPF CookieTagMap. However, under unknown conditions, all 10,000
spaces on the map were still observed to be filled. SkDestroyListener
and its parent classes, NetlinkMonitor, and FdEventsReader will log
errors. But due to the time required to fill the 10,000 fields is long,
traces in the device log are likely to have been overwritten and cannot
be observed.
This commit enables dumpsys netstats to print the last 20 traces of the
SkDestroyListener. If the issue is caused by the SkDestroyListener,
this will help in obtaining further clues when the issue is reported
again.

Bug: 306919485
Bug: 319348954
Test: atest FrameworksNetTests:android.net.connectivity.com.android.serv
      er.net.NetworkStatsServiceTest#testDumpSkDestroyListenerLogs
Test: manually add mLog.e(...) in
      SkDestroyListener#processNetlinkMessage and check dumpsys netstats
Change-Id: I5bbfe07e05cf959f809f28a7633ee5f99e29f641

Ken Chen   commited 2024-01-22 13:48:34 +08:00
375d780c8e
Merge "Apply multicast routing configs" into main am: cc23753288
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854609

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

Yang Sun   authored and   Automerger Merge Worker   commited 2024-01-22 01:27:44 +00:00
7056c4f797
Merge "Support multicast routing" into main am: bcc245d5bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817454

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

Yang Sun   authored and   Automerger Merge Worker   commited 2024-01-22 01:27:32 +00:00
1a9cdebc72
Merge "Apply multicast routing configs" into main
Yang Sun   authored and   Gerrit Code Review   commited 2024-01-22 00:57:42 +00:00
cc23753288
Merge "Support multicast routing" into main
Yang Sun   authored and   Gerrit Code Review   commited 2024-01-22 00:55:10 +00:00
bcc245d5bf
Apply multicast routing configs
Applies multicast routing configs when they are updated in
LocalNetworkConfig, or when local network/upstream network
status changes.

Bug: 281217735

Test: atest CSLocalAgentTests
Change-Id: Ib1c43c645a367d0f91e5cf0a0d9f8e5883be2c40

Yang Sun   commited 2024-01-20 21:32:20 +08:00
29037f6046
Support multicast routing
Added support to apply multicast routing config between network
interfaces in MulticastRoutingCoordinatorService.

Bug: 281217735

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.connectivity.MulticastRoutingCoordinatorServiceTest

Change-Id: If608b79d4e62a20d2e01755a83a901f6e274d9a2

Yang Sun   commited 2024-01-20 21:32:11 +08:00
baa50fa478
Merge "Remove the UID range check for TCP sockets" into main am: 26aab9b0d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2917225

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2024-01-19 02:54:54 +00:00
5a589207f3
Merge "Remove the UID range check for TCP sockets" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2024-01-19 02:53:29 +00:00
26aab9b0d9
Remove the UID range check for TCP sockets
The original patch (aosp/2891011) incorrectly counted TCP
sockets with keepalive enabled for VPNs. This issue was
caused by the UID range verification. On bypassable VPNs,
the socket mark is always correct. It's possible for an
app that is not in the UID ranges to establish a socket
on the VPN. But that socket should be counted for the
purposes of keepalive. The old code would correctly count
it and the new code will incorrectly not count it. Also,
the UID range verification does not help on non-bypassable
VPNs since the socket mark is always the mark of default
network, not the socket mark of the VPN.

Instead of reverting the entire patch, this commit
removes the UID range mechanism. The code refactoring from
the original commit (which used structured classes to read
socket information) has been kept as it is a valuable
improvement.

Bug: 320842519
Test: atest FrameworksNetTests
Change-Id: I00731796144c982b9fd4d9771f3d0db1f1529a89

Chiachang Wang   commited 2024-01-19 02:50:35 +00:00
ac2e8f354d
Merge "Fix NetworkRequestReceivedRemoved test" into main am: 8088170283
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2914322

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

Danuta Brotikovskaya   authored and   Automerger Merge Worker   commited 2024-01-18 12:48:56 +00:00
e79c7ab4f6
Fix NetworkRequestReceivedRemoved test
Test: atest FrameworksNetTests
Bug: 320588833
Change-Id: I8f80dee7b90a499bf761fdcccbc33182df259332

Danuta Brotikovskaya   commited 2024-01-18 09:32:32 +00:00
065ccfab8c
Merge "Implement NetworkRequestsState atom" into main am: d6aae95da7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890277

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

Danuta Brotikovskaya   authored and   Automerger Merge Worker   commited 2024-01-17 02:02:16 +00:00
8c1b61ce2c
Merge "Implement NetworkRequestsState atom" into main
Danuta Brotikovskaya   authored and   Gerrit Code Review   commited 2024-01-17 01:33:06 +00:00
d6aae95da7
Implement NetworkRequestsState atom
Bug: 278833398
Test: atest FrameworksNetTests
Change-Id: I95a8c8dddd2d8f6863fe64cd4a65ef48dfb5153a

Danuta Brotikovskaya   commited 2024-01-16 21:50:12 +00:00
878fd25d84
Merge "Use MonitorThreadLeak in CSTest related tests" into main am: d54613fd4e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2909204

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

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-16 09:12:10 +00:00
db7bda93b3
Merge "Use MonitorThreadLeak in CSTest related tests" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-16 08:36:36 +00:00
d54613fd4e
Merge "Fix replying to queries via unicast" into main am: 0c905a152e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749723

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-01-16 08:05:53 +00:00
6d68d80b02
Use MonitorThreadLeak in CSTest related tests
Fix current leaks in CSTest related tests, which leaked the
ConnectivityService and AlarmManager handler threads, and enable
the checks.

Using @DevSdkIgnoreRunner.MonitorThreadLeak ensures that tests properly
cleanup threads (in particular handler threads), as many leaked threads
could affect other tests.

Fix: 308520131
Test: atest ConnectivityCoverageTests
Change-Id: Ia6fb2c97f7a1740bafc0ab549440fdbeb1d5fad6

Paul Hu   commited 2024-01-16 06:56:34 +00:00
8792a72e8e