Commit graph android_packages_modules_Co.../tests/unit/java/com/android
Message SHA1
Remove expectBlockedStatusCallback
expect() is simpler to do the same thing

Bug: 157405399
Test: ConnectivityServiceTest NetworkStaticLibTests
Change-Id: I4d992fd7ea57d36a38afc33eaebcf2f7ce05aa80

Chalard Jean   commited 2023-02-09 16:19:14 +09:00
6486ca58fc
Merge "Remove expectCapabilitiesWith and Without"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-02-09 02:20:20 +00:00
2a6c2e0160
Merge changes from topic "experimental-udp-encap"
* changes:
  Experimental support for IPv6 UDP encap.
  Remove unused assignment.
  Refactor testCreateTransform and add IPv6 and encap coverage.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2023-02-08 06:06:17 +00:00
5d8c3b1428
Experimental support for IPv6 UDP encap.
This is a back-pocket solution only, to ensure that VpnManager
privileged clients can temporarily rely on IPv6 UDP encap if on
certain carriers IPv4 UDP and IPv6 ESP cannot provide acceptable
performance and battery life.

For these reasons IPv6 UDP encap is not a public or system API
and is triggered by passing a port greater than 65535 to the
existing openUdpEncapsulationSocket API.

Bug: 259001350
Test: new CTS tests
Change-Id: I02e0566ba910a300dda6a589cd265a3360add40c

Lorenzo Colitti   commited 2023-02-08 15:05:07 +09:00
b38fef8333
Remove expectCapabilitiesWith and Without
The base method is capable of doing this in a clearer manner,
so this redundant method is no longer needed.

Test: ConnectivityServiceTest FrameworksNetIntegrationTests
Bug: 157405399
Change-Id: I5f801d3c66374096fe7be7be21ee8d80264cd693

Chalard Jean   commited 2023-02-07 18:17:33 +09:00
99cab4a44c
Merge "Remove expectCapabilitiesThat"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-02-07 03:20:05 +00:00
f1aeb1051e
Merge "Combine two register broadcast receiver methods into one method"
Aaron Huang   authored and   Gerrit Code Review   commited 2023-02-07 03:06:37 +00:00
40eb6abb07
Merge "Rename onResolveStopped to onResolutionStopped"
Paul Hu   authored and   Gerrit Code Review   commited 2023-02-06 11:16:48 +00:00
e3e9f5622b
Combine two register broadcast receiver methods into one method
Combine registerPacProxBroadcastThat and registerConnectiviyBroadcastThat
into one method since they are highly similar.

Test: FrameworksNetTests:ConnectivityServiceTest
Change-Id: If0605a94208478399375a43c1ef92782d26cb805

Aaron Huang   commited 2023-02-06 19:04:01 +08:00
9e04018e8c
Merge "Make sure device is awake to verify the launcher is shown"
Aaron Huang   authored and   Gerrit Code Review   commited 2023-02-06 06:47:23 +00:00
c6d0770afc
Make sure device is awake to verify the launcher is shown
If the screen is off while running the test, it will
cause test fail because the test cannot verify the
launcher is shown. Thus, wake up the device first to
verify if the launcher is shown or not.

Bug: 261860642
Test: this
Change-Id: Icda8a2c6fdc97caf1986bb812ca366d9c9fde03f

Aaron Huang   commited 2023-02-06 12:13:26 +08:00
361e617b93
Remove expectCapabilitiesThat
expect() does the job better.

Test: FrameworksNetTests
Bug: 157405399
Change-Id: Ibb8fa432318cd2c37b23947a33c0e806111d099f

Chalard Jean   commited 2023-02-03 23:40:25 +09:00
c030aebe86
Merge "Allow Advertiser, DiscoveryManager runtime toggle"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-02-02 02:53:47 +00:00
e32490944b
Rename onResolveStopped to onResolutionStopped
Rename the method onResolveStopped(NsdServiceInfo) to
onResolutionStopped(NsdServiceInfo) for consistency as API
review feedback.

Bug: 266811051
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I788b5903ecaf78a9aa960dd3b7413a22f171c72f

Paul Hu   commited 2023-01-30 08:53:15 +00:00
b2c0f3407f
Remove getVpnLockdownUidRanges test api
getVpnLockdownUidRanges acquire lock and access internal state of a
Handler-based class (PermissionMonitor), which is bad practice in
general.

getVpnLockdownUidRanges returns keySet of mVpnLockdownUidRanges.
PermissionMonitor call updateUidLockdownRule and update the bpf map
based on mVpnLockdownUidRanges.
PermissionMonitorTest verifies the args of updateUidLockdownRule call.

So, It's not necessary to verify the mVpnLockdownUidRanges which
is internal states of PermissionMonitor.

Test: atest PermissionMonitorTest
Bug: 262199762
Change-Id: I85b39ab2aff44dcbe809b39560d6bb87fbb0c084

Motomu Utsumi   commited 2023-01-30 17:41:39 +09:00
9a9c11e33e
Remove getVpnInterfaceUidRanges test api
getVpnInterfaceUidRanges acquire lock and access internal state of a
Handler-based class (PermissionMonitor), which is bad practice in
general.

getVpnInterfaceUidRanges returns mVpnInterfaceUidRanges.
PermissionMonitor call add/removeUidInterfaceRules and update the bpf
map based on mVpnInterfaceUidRanges.
PermissionMonitorTest/ConnectivityServiceTest verifies the args of
add/removeUidInterfaceRules call.

So, It's not necessary to verify the mVpnInterfaceUidRanges which
is internal states of PermissionMonitor.

Test: atest ConnectivityServiceTest PermissionMonitorTest
Bug: 262199762
Change-Id: I31cbb9b1dd43eaf0354799a81c9df292fb5f6445

Motomu Utsumi   commited 2023-01-30 17:41:34 +09:00
ff12d34445
Allow Advertiser, DiscoveryManager runtime toggle
Allow toggling MdnsAdvertiser and MdnsDiscoveryManager at runtime, by
always creating them in NsdService constructor, but only using them when
the flag is on when starting discovery, resolve or registration.

When stopping, based on the type of the stored request, stop the
corresponding backend.

Bug: 265891278
Test: atest NsdServiceTest
Change-Id: I7cb2f9fe9e1ed3dc77616689a8e3ffa00f5bc269

Remi NGUYEN VAN   commited 2023-01-27 19:37:04 +09:00
a8a777bbbd
Add defer-until-active policy to CONNECTIVITY_ACTION.
This allows deferring the broadcast delivery to apps in
the Cached state.

Bug: 255545931
Test: TH
Change-Id: Idd94ad5f9dbabf88f6070108bdfc8e60f34304a6

Sudheer Shanka   commited 2023-01-24 19:33:06 +00:00
74fe7178af
Merge "Do not return found services on dummy0"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-24 04:10:58 +00:00
5fc52a4b2f
Do not return found services on dummy0
When registering and advertising a service on the same device, it is
possible for NsdService to find the service on the dummy0 interface. It
is however unusable and not resolveable.

Skip callbacks on the dummy0 interface as they would confuse apps and
tests.

Bug: 266176036
Test: atest NsdServiceTest
Change-Id: I98cca0135e0f6936187d45707cbdad7a7f263ff1

Remi NGUYEN VAN   commited 2023-01-23 19:14:57 +09:00
643edb6715
Fix a bug where adding a user doesn't update network allow lists
Even if there are no preferences, the allow list needs
to be updated upon adding a new user, because it's set
unconditionally when the network connects.

Adding all existing UIDs would address this issue too
and we probably want to do it, but immediately this
seems simpler.

Bug: 266136779
Test: new test for this
Change-Id: I77091a6c3d3ccf2b80ab0aaa01d09ef0df922501

Chalard Jean   commited 2023-01-23 17:40:01 +09:00
e0abd52557
Merge "[DK2-2]Add flag to control dynamic keepalive mode"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-01-20 11:59:26 +00:00
c795473a80
[DK2-2]Add flag to control dynamic keepalive mode
Add a flag to control dynamic keepalive mode so that this
feature could be dynamically enabled via flag push. Default
is enabled in KeepaliveTracker.

Bug: 259000745
Test: atest FrameworksNetTests
Change-Id: I438de9aefd22229669a9ae4da5fd109fdfa73b10

chiachangwang   authored and   Chalard Jean   commited 2023-01-20 17:47:11 +09:00
a38b723fb9
Merge "Implement conflict detection"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-20 06:00:54 +00:00
3c42e517ac
Implement conflict detection
On each received packet, query MdnsRecordRepository to detect any
conflicting service, and report it though onServiceConflict.

Implement restartProbingForConflict and renameServiceForConflict which
may be called when that callback is dispatched.

Bug: 266151066
Test: atest MndsInterfaceAdvertiserTest MdnsRecordRepositoryTest
Change-Id: I5434b00879e0c8f7fc1e4769455b688c3bd7a9b5

Remi NGUYEN VAN   commited 2023-01-20 12:53:32 +09:00
c8db64bdb1
Merge "New API to listen service update"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-19 15:25:23 +00:00
93587f609b
New API to listen service update
Currently, the resolution is a one shot query, it only notifies
the first finding service information. There is no way to listen
the service update. Thus, add a new API that can register a
callback to listen to the service updates continuously.

Bug: 245369943
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I0e9d92b9028375feb3e344ab6c4acb515c5b2be9

Paul Hu   authored and   Remi NGUYEN VAN   commited 2023-01-19 20:16:03 +09:00
18aecccc9d
[DK2-0]Create AutomaticOnOffKeepaliveTracker
Add a new AutomaticOnOffKeepaliveTracker class between
ConnectivityService and KeepaliveTracker to handle the automatic
on/off keepalive. This commit only creates this new class and
move the TCP polling code to the new class as a preparation for
the following commit.

The original test file was created for testing the TCP polling
mechanism, so rename it to match the new class.

Bug: 259000745
Test: m ; atest FrameworksNetTests
Change-Id: I1b229f906283c0f5ef7a3efdb0572fcbfc5df72b

chiachangwang   authored and   Chalard Jean   commited 2023-01-19 13:17:54 +09:00
3d60bacfa0
Merge "New API to stop service resolution"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-19 01:51:50 +00:00
fd02056713
Merge "Optionally use MdnsAdvertiser for advertising"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-01-18 15:53:03 +00:00
55bb102b2d
Merge "Update VpnManagerServiceTest to work with lockdown VPN main user changes."
Oli Lan   authored and   Gerrit Code Review   commited 2023-01-18 15:32:14 +00:00
f738c40e8c
Optionally use MdnsAdvertiser for advertising
Based on a flag, use MdnsAdvertiser for advertising instead of the
legacy mdnsresponder implementation.

Bug: 241738458
Test: atest NsdServiceTest
Change-Id: I2d5069097c11f2959e3792cac326d179a3116479

Remi NGUYEN VAN   commited 2023-01-18 23:23:43 +09:00
5b9074cf7e
New API to stop service resolution
Resolve service may take long time due to network issue or
using wrong service information, but users are not able to stop
it. They can only wait for the callback of resolveService to end,
which sometimes takes a long time. Thus, add the new API that
users can stop the service resolution.

Bug: 245369943
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I6b6183c8c73f8db981b9afa51fbc73bf886d9ed3

Paul Hu   commited 2023-01-18 10:10:25 +00:00
b58deb706c
Merge "Implement service resolved callback"
Paul Hu   authored and   Gerrit Code Review   commited 2023-01-18 01:43:28 +00:00
38f5d4661b
Merge changes I69128db9,I13db22f8
* changes:
  Implement onServiceConflict
  Add replying to queries

Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-18 01:13:35 +00:00
aa15a8ea5d
Merge "Factor out response decoding into MdnsPacket"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-18 01:12:58 +00:00
fe73104cc1
Merge changes I298816ac,I3f41b4fe,Ibd782029
* changes:
  Implement service lost callback
  Implement service found callback
  Use MdnsDiscoveryManager for discovery

Paul Hu   authored and   Gerrit Code Review   commited 2023-01-17 15:51:54 +00:00
f71485f351
Implement service resolved callback
Service resolved should be notified when receive the
onServiceFound callbacks from MdnsServiceBrowserListener

Bug: 254166302
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I681720065084bf3449c5b1ab44cd4ed6a659dcdb

Paul Hu   commited 2023-01-17 23:25:08 +08:00
75069ed47e
Implement onServiceConflict
Implement the onServiceConflict callback in MdnsAdvertiser, refactoring
the conflict detection to reuse it both in onServiceConflict (when a
conflict is detected on the network after add) and at service add time.

Bug: 241738458
Test: atest MdnsAdvertiserTest
Change-Id: I69128db936296bd2c5e90e9f00df19fd881e1748

Remi NGUYEN VAN   commited 2023-01-17 23:21:28 +09:00
b1b7fab156
Add replying to queries
MdnsInterfaceAdvertiser registers to receive incoming packets, and
sends replies to queries as built by MdnsRecordRepository.

Bug: 241738458
Test: atest
Change-Id: I13db22f8efc870b6e0747d105f6bc8f759910f81

Remi NGUYEN VAN   commited 2023-01-17 23:10:42 +09:00
46676497eb
Factor out response decoding into MdnsPacket
Factor out generic packet decoding into MdnsPacket, out from
MdnsResponseDecoder.

This allows reusing the same decoding code for replies, and other kinds
of MdnsPackets.

Bug: 241738458
Test: atest MdnsResponseDecoderTests MdnsPacketTest
Change-Id: I4380f80240ed5a367accfc1b0c595967ee475578

Remi NGUYEN VAN   commited 2023-01-17 23:00:34 +09:00
5fbaea55d8
Implement service lost callback
Service lost should be notified when receive the
onServiceNameRemoved callbacks from
MdnsServiceBrowserListener.

Bug: 254166302
Test: atest FrameworksNetTests
Change-Id: I298816ac186efeda85cea4cd11f3beab6b341bc5

Paul Hu   commited 2023-01-17 21:26:26 +08:00
319751a572
Merge "[DK1]Add TCP polling mechanism"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-01-17 13:04:04 +00:00
c42f1adfd5
Implement service found callback
Service found should be notified when receives the
onServiceNameDiscovered callbacks from
MdnsServiceBrowserListener.

Bug: 254166302
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I3f41b4fe85cd85ad356fa764663187a88914412c

Paul Hu   commited 2023-01-17 20:07:22 +08:00
019621e070
Use MdnsDiscoveryManager for discovery
Register/Unregister the listener to/from MdnsDiscoveryManager
when discovery started/stopped.

Bug: 254166302
Test: atest FrameworksNetTests CtsNetTestsCases
Change-Id: Ibd782029826ac5856c608165928cd942e46dd9a4

Paul Hu   commited 2023-01-17 19:16:50 +08:00
23fa202478
Merge "Rename mXXXNetworkAgent to mXXXAgent"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-01-17 08:12:31 +00:00
76ee573dda
Merge "Remove dev recorder from NetworkStatsService"
Aaron Huang   authored and   Gerrit Code Review   commited 2023-01-17 07:27:35 +00:00
a3ed25924e
Merge "Import CallbackEntries in ConnectivityServiceTest"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-01-17 07:24:53 +00:00
6366d7c2db
[DK1]Add TCP polling mechanism
Add TCP polling mechanism in KeepaliveTracker to understand if
there are any TCP sockets in the target network. This is a
preparation commit for dynamically control keepalive based on
the existence of TCP sockets. This is non-functional now since
there is no caller to retrieve the information now.

Bug: 259000745
Test: atest FrameworksNetTests
Test: Manually test by creating TCP sockets on the target network
      in device and check if deisgn works.
Change-Id: I355ac340cad2fac618bb9d65fb1b1539ea644959

chiachangwang   commited 2023-01-17 07:24:48 +00:00
6a9f0db983
Merge "Create the MdnsDiscoveryManager"
Paul Hu   authored and   Gerrit Code Review   commited 2023-01-17 07:05:13 +00:00
1b81be6de6