Commit graph android_packages_modules_Co.../tests/unit/java
Message SHA1
Merge "add TRANSPORT_THREAD to NetworkCapabilities"
Kangping Dong   authored and   Gerrit Code Review   commited 2023-02-28 07:16:16 +00:00
7dc4459d33
Merge "Address comments at aosp/2361702"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-02-23 11:07:03 +00:00
ea5e220c90
Address comments at aosp/2361702
Test: 1. Patch local built module on T device
      2. atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Fix: 267968887
Change-Id: I86e5be9a0cee0621ff9ef0996d56a51fc5f408c2

Junyu Lai   commited 2023-02-23 15:21:29 +08:00
c53a169a90
Merge "Add test for using ESP_IP_VERSION and ESP_ENCAP_TYPE in Vpn"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-02-22 05:58:02 +00:00
bf8b243978
Merge "Fix a bug where alarms are deduplicated"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-02-22 04:08:47 +00:00
3bee8c9afa
Fix a bug where alarms are deduplicated
Test: new test in this patch
Bug: 269719647
Change-Id: I32e8d35f1751e2fd81a0007ae6cb308b6bcbb463

Chalard Jean   commited 2023-02-22 03:00:46 +09:00
f4eb1ae6b9
Add test for using ESP_IP_VERSION and ESP_ENCAP_TYPE in Vpn
Bug: 269714344
Test: atest FrameworksNetTests
Change-Id: Ia9c47967a1b96204a6a739d133f2b8455229af52

chiachangwang   commited 2023-02-21 11:31:28 +00:00
84ea53691c
Update VpnTests for adding ESP arguments
Test: VpnTest
Bug: 269714344
Change-Id: I0d8a2818ea0b67ebb5da7dbac9cd6aea9bede386

Chalard Jean   authored and   chiachangwang   commited 2023-02-21 05:59:52 +00:00
e4341f0933
Merge "Fix flaky test testRestrictedProfileAffectsVpnUidRanges"
Lucas Lin   authored and   Gerrit Code Review   commited 2023-02-18 06:19:26 +00:00
1e9120a863
Fix flaky test testRestrictedProfileAffectsVpnUidRanges
File a VPN request to prevent the VPN network being lingered.

The VPN network will be lingered and onCapabilitiesChanged()
will be fired when the linger timer is expired, which will
cause the test receiving an unexpected onCapabilitiesChnaged()
and make the test failed eventually.

Bug: 265396507
Bug: 265510523
Test: atest FrameworksNetTests
Change-Id: Id9ad810d46cb2bbb13fa5c602520635ae8e73e31

lucaslin   authored and   Lucas Lin   commited 2023-02-18 02:59:05 +00:00
881daf084f
Merge "Enable automatic keepalives by default."
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-02-17 23:53:00 +00:00
4e1695f711
Enable automatic keepalives by default.
This can still be flagged off.

Test: FrameworksNetTests
Change-Id: Ic69911d21da380662a65f1c482ccee107f851a23

Chalard Jean   commited 2023-02-17 15:37:57 +09:00
759fbc7f3d
Merge "Add getUidRule method to BpfNetMaps"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-02-17 01:52:52 +00:00
6c01bd30af
Merge "Add unit tests for new VpnProfile fields"
Benedict Wong   authored and   Gerrit Code Review   commited 2023-02-15 23:42:51 +00:00
78dea027ff
Merge "Allow SUW to access registerSystemDefaultNetworkCallback"
Quang Luong   authored and   Gerrit Code Review   commited 2023-02-15 20:22:10 +00:00
0f6a2e69cd
Add unit tests for new VpnProfile fields
Add and update tests for automaticNattKeepaliveTimerEnabled
and automaticIpVersionSelectionEnabled fields.

Test: atest Ikev2VpnProfileTest VpnProfileTest
Change-Id: I4e424abd2197d9099a2efe0bd8c4b9120bfcfe3a

chiachangwang   commited 2023-02-15 15:01:28 +00:00
015b68b192
[DK5]Add debugging information for automaticOnOff keepalive
Print state and keepalive information in the dump.

Also update ConnectivityService and the corresponding test to
create AutomaticOnOffKeepaliveTracker from a Dependencies class.
ConnectivityService#dump() will require READ_DEVICE_CONFIG
permission because of the new dump() in AutomaticOnOffKeepaliveTreacker.
ConnectivityServiceTest should focus on verifying design in
ConnectivityService, so skipping the DeviceConfig check via a fake
Dependencies class in the unit test.

Sample dump:

AutomaticOnOff enabled: true
  AutomaticOnOffKeepalive [KeepaliveInfo [ type=1 network=100 startedS ... ], state=STATE_ENABLED ]

Bug: 259000745
Test: m ; atest FrameworksNetTests CtsNetTestCases
Change-Id: I9ac725bcef7daec1d1a12bad592b7fa6856a1707

chiachangwang   commited 2023-02-13 09:54:36 +00:00
7c17c283ea
Merge "Remove expectLinkPropertiesThat"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-02-11 02:09:38 +00:00
d500f20f90
Allow SUW to access registerSystemDefaultNetworkCallback
registerSystemDefaultNetworkCallback is required by WifiTrackerLib to
detect the system default network for UI purposes. Currently this API is
allowed for holders of the NETWORK_SETTINGS permission, but not
NETWORK_SETUP_WIZARD. Since SUW also uses WifiTrackerLib, we should
allow this API for NETWORK_SETUP_WIZARD as well.

Bug: 230643853
Test: atest ConnectivityServiceTest
Change-Id: Ic01a186f91ed67b4603b6b8964921be7473a483a

Quang Luong   commited 2023-02-11 00:31:59 +00:00
98858d6b27
Merge "Tempates with different subscriber ID should be not equal"
Aaron Huang   authored and   Gerrit Code Review   commited 2023-02-10 08:06:07 +00:00
2a69e41772
Tempates with different subscriber ID should be not equal
mSubscriberId was removed from NetworkTemplate and equals/hashCode
does not check the mMatchSubscriberIds. This will cause tempates
with different subscriber ID matching that are equal now. Thus
adding the check for mMatchSubscriberIds to fix it.

Bug: 267968247
Test: FrameworksNetTests:NetworkTemplateTest
Change-Id: I2956bf4c8cf2c4d73ebe102d53e755fbcc5d7642

Aaron Huang   commited 2023-02-10 08:04:53 +00:00
c9371d05fe
Remove expectLinkPropertiesThat
expect() is simply better

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

Chalard Jean   commited 2023-02-10 14:32:14 +09:00
816f0af86a
Merge changes from topics "remove_expectblocked", "rename_reason"
* changes:
  Rename BlockedStatusInt.blocked to .reason
  Remove expectBlockedStatusCallback

Jean Chalard   authored and   Gerrit Code Review   commited 2023-02-10 05:26:50 +00:00
9f3857754d
Moves all compatibility flags to ConnectivityCompatChanges.java
ConnectivityCompatChanges.java becomes the centralized place for all the
CompatChanges used in the Connectivity module. By putting all the
CompatChanges here, we are able to manage them under a single
platform_compat_config.

Bug: 268440216
Test: atest FrameworksNetTests
Change-Id: I3e17af545718073d7d1c96e27298e7790563fd33

Yuyang Huang   commited 2023-02-09 19:51:37 +09:00
90a2cbdd8d
Rename BlockedStatusInt.blocked to .reason
It's a reason, so it's a lot clearer this way

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

Chalard Jean   commited 2023-02-09 16:19:14 +09:00
9d8397a87a
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
Add getUidRule method to BpfNetMaps
Upcoming CLs use this method to add chain status to failure log of
ConnectivityManagerTest#testFirewallBlocking which is a flaky test

Test: atest BpfNetMapsTest
Bug: 262141231
Change-Id: Ib130a28c708f675c79b889bf293dfe6b0f8d7f60

Motomu Utsumi   commited 2023-02-01 17:05:36 +09:00
56c412a9c8
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