Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
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
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
Merge changes from topic "fix-mdns" into main
* changes:
  [mdns] add tests for verifying address of mDNS reply
  [mdns] fix wrong NSEC answer for unique RRs
  [mdns] fix duplicated records for multiple questions

Kangping Dong   authored and   Gerrit Code Review   commited 2023-12-27 13:15:30 +00:00
81e6439298
Change throw to Log.wtf
Log.wtf should avoid crashes, while making sure that one can still
notice if there is a problem.

In particular, it may be possible that calling ensureIpServerStopped
and ensureIpServerStarted could start forwarding before the previous
IpServer has stopped it.

Bug: 314260975
Change-Id: I047a673d2fe6f218192d3144fa0bd60ce8739a15
Test: TH

Remi NGUYEN VAN   commited 2023-12-27 19:31:54 +09:00
ca3c524b49
[mdns] add tests for verifying address of mDNS reply
Bug: 265095929
Test: atest FrameworksNetTests
Change-Id: I3499fb9dfc24fec9648f9c97d6028c3fca4f925a

Kangping Dong   commited 2023-12-27 16:54:18 +08:00
b83b90e779
[mdns] fix wrong NSEC answer for unique RRs
Existing MdnsRecordRepositiry#getReply will send a NSEC RR in the reply
when 1) a query for a unique RR is not found or 2) any unique name which is
included in the answer sections. The second one is not aligned with the
spec:

```
On receipt of a question for a particular name, rrtype, and rrclass,
for which a responder does have one or more unique answers, the
responder MAY also include an NSEC record in the Additional Record
Section indicating the nonexistence of other rrtypes for that name
and rrclass.
```

This commit fixes the issue in 2) by checking that all unique records of
the name are included in the answers before adding a NSEC record.

Bug: 265095929
Test: atest FrameworksNetTests
Change-Id: I0531fbccf98e69a50bb8a45e529caaed3ad80b59

Kangping Dong   commited 2023-12-27 16:54:15 +08:00
04b61c4a3c
Merge "[AF03] Adopt FastDataInput" into main am: 713fc49cdb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2873139

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-12-26 09:52:20 +00:00
cbe7303e60
Merge "[AF03] Adopt FastDataInput" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-12-26 09:15:02 +00:00
713fc49cdb
[AF03] Adopt FastDataInput
FastDataInput for reading persistent data is currently disabled
by default. This functionality will be gradually enabled through
A/B experiments to assess its impact.

One-shot boot time increase up to 10 second is one expected
outcome in worst case. Currently, the persistent data was loaded
when the first caller query it, but in this change it will be
done twice in the boot stage due to the needs of doing comparison.

Test: adb shell dumpsys netstats
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Test: manual test against data points under benchmark/assets/dataset
Bug: 313841499

Change-Id: Ia927bd115de5453ca3ee22104f3efbf44a55c2b8

Junyu Lai   commited 2023-12-26 15:42:09 +08:00
da6020a329
Merge "Check target sockets by UID range" into main am: 34afa7b73c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2891011

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-12-26 06:52:07 +00:00
25b1d89b8a
Merge "Check target sockets by UID range" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-12-26 06:19:17 +00:00
34afa7b73c
Check target sockets by UID range
This commit optimizes the mechanism to examine the TCP sockets
based on the VPN UID range.

The automaticOnOffKeepalives will be paused/resumed by checking
the TCP sockets status on the VPN network. The existing design
considers all UIDs, not the UID ranges for the specific VPN
network. This may lead to an inaccurate judgement to not to
stop the keepalive even when there is no socket on the VPN
network.

This commit is also a part of follow-up work from aosp/2354202
to use structized class to parse the TCP sockets.

Bug: 311119352
Bug: 265877161
Test: atest FrameworksNetTests
Change-Id: I4a6b751cb904b9c18ed1df420cc880ea38022d6a

Chiachang Wang   commited 2023-12-26 05:22:00 +00:00
d8474bb1cf
Merge "[AF06] Fill file attributes metrics" into main am: 46afd1b4cb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2879868

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2023-12-26 04:59:58 +00:00
177181a3ca
Merge "[AF06] Fill file attributes metrics" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2023-12-26 04:34:05 +00:00
46afd1b4cb
Merge "Add MdnsReplySenderTest" into main am: 1cbb9ab59f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854585

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-12-25 08:43:00 +00:00
b0b016ad35
Merge "Add MdnsReplySenderTest" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-12-25 08:25:21 +00:00
1cbb9ab59f
Merge "Correct coding format" into main am: 32350ca201
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2891051

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-12-25 07:18:59 +00:00
d61f070740
Merge "Correct coding format" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-12-25 07:00:41 +00:00
32350ca201
Add MdnsReplySenderTest
Currently, the MdnsReplySender doesn't have a dedicated test
class to verify its functionality. To address this gap, add the
MdnsReplySenderTest class, which can test all methods within the
MdnsReplySender class.

Bug: 312657709
Test: atest FrameworksNetTests
Change-Id: Ibd948d97d38c012c63092ed4c6877d04b1ff14c1

Paul Hu   commited 2023-12-25 14:23:41 +08:00
0228e63a45
[mdns] fix duplicated records for multiple questions
Existing MdnsRecordRepositiry#getReply will result in duplicated RRs in
answer and additional records sections if multiple PTR questions for the
same service are received in a single query message.

This commit fixes this by using a Set<> for maintaining the RR set and
moving the NSEC construction to outer of the addReplyFromService() after
all answer and additional records have been added.

This commit also refactors the unit tests to cover more cases of
multiple queries other than PTR records

Bug: 265095929
Change-Id: I379dd89703915406c5700ed19aad46ef4035b917

Kangping Dong   commited 2023-12-25 13:59:41 +08:00
0c374445dc
Correct coding format
A clean up commit to correct the coding format.

Test: atest FrameworksNetTests
Change-Id: I7d7ed3765a0be503400ed3c33ea461e9baa3e72d

Chiachang Wang   commited 2023-12-25 05:55:29 +00:00
4823f0fb4d
[AF06] Fill file attributes metrics
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsRecorderTest
Bug: 313841499

Change-Id: I12759e14c29917ad61eedad4cfee21f153a1a6bd

Junyu Lai   commited 2023-12-25 10:39:59 +08:00
ed1097b733
Merge "[AF02.1] Support read by FastDataInput in the NetworkStatsRecorder" into main am: 962515a8a8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861872

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2023-12-25 02:29:41 +00:00
1553beb711
Merge "[AF02.1] Support read by FastDataInput in the NetworkStatsRecorder" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2023-12-25 01:58:14 +00:00
962515a8a8
Merge "Support mDns Known-Answer Suppression" into main am: 0db97a6f93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842955

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-12-22 09:07:58 +00:00
fdd030ea37
Merge "Support mDns Known-Answer Suppression" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-12-22 08:32:29 +00:00
0db97a6f93
Merge "Implement NetworkRequestsState atom" into main am: 0d8a980059
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2868526

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

Danuta Brotikovskaya   authored and   Automerger Merge Worker   commited 2023-12-21 18:46:00 +00:00
77ff297f2a
Merge "Implement NetworkRequestsState atom" into main
Danuta Brotikovskaya   authored and   Gerrit Code Review   commited 2023-12-21 18:02:50 +00:00
0d8a980059
Implement NetworkRequestsState atom
Bug: 278833398
Test: atest FrameworksNetTests
Change-Id: Ie83bf49693411e4c3f629c07d98071505f48c08f

Danuta Brotikovskaya   commited 2023-12-21 15:56:03 +00:00
e3245081b1
[AF07] Make subclass of NetworkStatsService#Dependencies in the tests am: 16936828a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2887407

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2023-12-21 15:19:11 +00:00
69280c4fa6
[AF07] Make subclass of NetworkStatsService#Dependencies in the tests
This is a no-op refactoring that make a subclass of
NetworkStatsService#Dependencies in order to make the
follow-up changes can implement private getters in the
class and easier to review.

Test: TH
Bug: 313841499
Change-Id: If0de525b32abb9ad715c633f42b3c65c0d720d24

Junyu Lai   commited 2023-12-21 10:38:15 +00:00
16936828a0