Commit graph android_packages_modules_Co.../tests/unit/java/com/android
Message SHA1
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
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
Fix replying to queries via unicast
Instead of (wrongly) looking at the DNS message flags for the Query
Unicast bit, look at the flag in the question record.

The previous bug means that all queries would be replied multicast
instead of sometimes unicast. The fix is flagged off as this is a
behavior change that may affect performance and latency.

Bug: 289482497
Test: atest
Change-Id: I08e30c4ffa747c9073d631e8addca1278ea40648

Remi NGUYEN VAN   commited 2024-01-15 20:26:28 +09:00
0ca094b577
Only use source addresses in handlePacket am: 7078ac59b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2908143

Change-Id: I451c0348daca49612c7f6c3d1d5b5bb1930ca502
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-15 06:30:56 +00:00
85fdea8df8
Only use source addresses in handlePacket
MulticastPacketReader uses an InetSocketAddress as a buffer that gets
filled for each incoming packet for the source address. Similarly to the
receive buffer, it should not be used outside of the handlePacket
method, as it will be modified on the handler thread when further
packets are received.

Fix the current usage in MdnsInterfaceAdvertiser/MdnsRecordRepository.
Fortunately due to a bug packets are never replied unicast, so today the
MdnsRecordRepository code using the source address never triggers, even
though it may be circulating an incorrect source address instance that
changes over time.

Test: atest
Change-Id: I4cadfa6e54d1b37d9a6b0f8ca0269193a229bc51

Remi NGUYEN VAN   commited 2024-01-12 19:11:44 +09:00
7078ac59b9
Merge "Use MonitorThreadLeak in ConnectivityService tests" into main am: c45efc312e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2906141

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-12 06:54:40 +00:00
313f76d456
Merge "Revert "Implement NetworkRequestsState atom"" into main am: a8062d9ed0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890276

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-12 06:54:27 +00:00
d9fd46027b
Merge "Use MonitorThreadLeak in ConnectivityService tests" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-01-12 06:48:51 +00:00
c45efc312e
Merge "Revert "Implement NetworkRequestsState atom"" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-01-12 05:18:49 +00:00
a8062d9ed0
Merge "Fix leak of NetworkAgentWrapper HandlerThread" into main am: 64a8ead5d1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2902567

Change-Id: I2fad763b61d3b4d9ee6903eef5943a681d1c534c
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-11 11:09:58 +00:00
d2d73ed550
Merge "Fix leak of NetworkAgentWrapper HandlerThread" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-01-11 10:33:21 +00:00
64a8ead5d1
Use MonitorThreadLeak in ConnectivityService tests
Fix current leaks in ConnectivityServiceIntegrationTest, which leaked
the ConnectivityService and CarrierPrivilegeAuthenticator 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.

Bug: 310659032
Test: atest --rerun-until-failure 20
Change-Id: Ia62d33d86217fef1d03532bb51c890a90430a70e

Remi NGUYEN VAN   commited 2024-01-11 19:19:13 +09:00
de0b07b46e
Fix leak of NetworkAgentWrapper HandlerThread
ConnectivityServiceTest creates hundreds of NetworkAgentWrapper, without
stopping their HandlerThread. This leaks a lot of threads while tests
are running.

Ensure the threads are stopped in ConnectivityServiceTest, and
integration tests that also use NetworkAgentWrapper.

Test: atest, watch adb shell ps -T [test package pid]
Bug: 310659032
Change-Id: I34f367b2efe3d05e1db5eab4c9fd93ee79c1b683

Remi NGUYEN VAN   commited 2024-01-11 17:59:29 +09:00
2491624106
Merge "Migrate Tethering#dump to use runWithScissorsForDump" into main am: 7b4ebdf2ef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2865335

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2024-01-10 10:09:07 +00:00
2224c7285a
Merge "Migrate Tethering#dump to use runWithScissorsForDump" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2024-01-10 09:46:12 +00:00
7b4ebdf2ef
Migrate Tethering#dump to use runWithScissorsForDump
This change includes:
  1. Refactor the logic in Tethering#dump into utils class.
  2. Move the utils class to a common place which could be referenced
     from other sub-modules.
  3. Add @MonitorThreadLeak annotation to enforce
     there is no thread leak problem.

Test: atest FrameworksNetTests NetworkStaticLibTests
Test: atest ConnectivityCoverageTests:com.android.networkstack.tethering.TetheringTest#testDumpTetheringLog
Test: adb shell dumpsys tethering (with hardcoded exception)
Fix: 312669345

Change-Id: Ia6fdfeeec2110afa0ec9e056e9db3843748845c3

Junyu Lai   commited 2024-01-10 13:56:55 +08:00
2ff42d264b
Revert "Implement NetworkRequestsState atom"
This reverts commit e3245081b1.

Reason for revert: The change is unsafe as it introduces code with writings to a separate thread whose message queue size is unlimited.
Test: atest FrameworksNetTests

Change-Id: I392a30f77cfbcd17f420e29f0944604fd789b10a

Danuta Brotikovskaya   commited 2023-12-28 18:19:20 +00:00
2971ffc776
Merge "Change throw to Log.wtf" into main am: ab2fd4cac9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2855567

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2023-12-28 02:10:03 +00:00
f5c44cfdea
Merge "Change throw to Log.wtf" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-12-28 01:40:10 +00:00
ab2fd4cac9
Stop registering native mdns service am: 80c9f6f35f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2832130

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

Ken Chen   authored and   Automerger Merge Worker   commited 2023-12-27 14:24:25 +00:00
d0147f3b40
Stop registering native mdns service
NsdService switched from Netd native solution to Java solution on
Android U. MDNS service provided by Netd will be removed from Android V.

1. Stop registering native mdns service from V.
2. Stop startDaemon() in NsdManager from V.
3. As a double safety, return early in NsdService methods that call the
   native mdns service when platform version is V+.
4. Modify NsdManagerTest to cover V+ behavior.

Bug: 298594687
Test: Build. Presubmit.
Change-Id: Ifdac8f7a44aa57d93d453ba482ec473a2b531452

Ken Chen   commited 2023-12-27 13:54:50 +00:00
80c9f6f35f
Merge changes from topic "fix-mdns" into main am: 81e6439298
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2868035

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2023-12-27 13:35:57 +00:00
f7fc8579b2