summaryrefslogtreecommitdiff
path: root/tests/vcn/java
AgeCommit message (Collapse)Author
2022-03-15Merge SP2A.220305.013Haamed Gheibi
Bug: 220074017 Change-Id: Idfdd94e902f656ac65a2a75dfdd199f6f85ba472
2021-09-13Always trigger safe mode callbacksBenedict Wong
This change ensures that safe mode callbacks are always triggered from the VcnGatewayConnection up, ensuring that if a gateway connection is restarted and successfully validates, it will notify the Vcn class, and kick it out of safe mode. Previously, if a VCN had entered safe mode, and a config was updated, the newly updated VcnGatewayConnection would be brought up as "not" in safe mode, and thus the onSafeModeStatusChanged() callback would never be fired if the new VcnGatewayConnection successfully connected. Calling onSafeModeStatusChanged() multiple times is safe, and serves as a "connection status changed" callback. Bug: 196841140 Test: atest FrameworksVcnTests Test: manual testing Original-Change: https://android-review.googlesource.com/1811936 Change-Id: I43c82ada9e9429e8283be65ab73d13075dfd6038 Merged-In: I856517924d0a767b63ea6127b7d4e39e09e93f2c (cherry picked from commit 7cf35e7bd940c6f4ee0035a4c1b081c71c85c7f9)
2021-07-21Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgentsBenedict Wong
This change sets TRANSPORT_PRIMARY for all NetworkScore objects passed to ConnectivityService by the VCN. Without this patch, a VCN in safe mode will never get any NetworkRequests, since the new Policy-based NetworkRanker always prioritizes a existing satisfier of a network, regardless of score. However, a higher-priority policy check ensures that a TRANSPORT_PRIMARY request is used if it exists. This changes the VCN to utilize that functionality. Bug: 194122634 Test: atest FrameworksVcnTests Original-Change: https://android-review.googlesource.com/1772025 Merged-In: I3a298a6c4c594c6e224f3f05764614802c00e9b0 Change-Id: I3a298a6c4c594c6e224f3f05764614802c00e9b0
2021-07-17Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being ↵Benedict Wong
set" into sc-dev
2021-07-16Ensure VcnGatewayConnection#isQuitting never gets unset after being setBenedict Wong
This change ensures that the VcnGatewayConnection can never abort a quitting command; specifically, if a non-quitting disconnect request is processed after a quitting disconnect request, the isQuitting value MUST continue to stay set (as true). Failure to OR the values results in orphaned VcnGatewayConnection(s), and the VCN network thrashing. Additionally reduce verbosity of local logs, to ensure it better captures failures and logWtf(s) Bug: 192776413 Test: atest FrameworksVcnTests Original-Change: https://android-review.googlesource.com/1768623 Merged-In: Iec8dae701838794261957609bae4e270eaa9cdc7 Change-Id: Iec8dae701838794261957609bae4e270eaa9cdc7
2021-07-16Limit VCNs to one running at a given timeBenedict Wong
This change ensures that there is only ever one VCN running at a given point in time, and that if the device has switched to using a subscription in a different subscription group, the VCN will immediately tear down. This ensures that when on a DSDS device, when the VCN-enabled subscription is not the default/active subscription, the other subscription's network will never be outscored by the VCN, and thus get torn down. Bug: 190761448 Test: atest FrameworksVcnTests Test: Manual testing to ensure common functionality Original-Change: https://android-review.googlesource.com/1767050 Merged-In: I8031fab7502880d38420058451df41f47567c458 Change-Id: I8031fab7502880d38420058451df41f47567c458
2021-07-02Add VCN underlying networksBenedict Wong
This change declares underlying networks for the VCN for the purposes of app data accounting Bug: 190620024 Test: atest FrameworksVcnTests Original-Change: https://android-review.googlesource.com/1750241 Merged-In: Ida2cd5975250604064b0baed00bc7c201ea97c5e Change-Id: Ida2cd5975250604064b0baed00bc7c201ea97c5e
2021-06-26Merge "Fix dangling NetworkAgent" into sc-devTreeHugger Robot
2021-06-25Fix dangling NetworkAgentBenedict Wong
This change fixes the potential for a networkAgent to be left dangling, due to a situation where a VcnGatewayConnection shuts down, but fails to unregister it's NetworkAgent. The root cause was that the NetworkAgent was not unregistered when moving to the DisconnectedState from the RetryTimeoutState, and the new state assumed that there was no NetworkAgent, and thus failed to close it when disconnecting. Thus, this change ensures that the NetworkAgent is closed before moving to the DisconnectedState. Additionally, it adds safety-checks to onQuitting(), ensuring that if all else fails, these fields are cleaned up. Lastly, this change adds the specific gateway reference to facilitate future debugging of issues such as this where there is potential for duplicate networks, or gateway connections. Bug: 191707296 Test: atest FrameworksVcnTests Change-Id: I84cd43a0c136662f5c2d229650f1f5f889e6f144 Merged-In: I84cd43a0c136662f5c2d229650f1f5f889e6f144 (cherry picked from commit 7207a83ca8796ced7e7fc4f7eba2433ecaa2ff0f)
2021-06-23Include IkeTunnelConnectionParams in #hashCode and #equalsYan Yan
This commit includes IkeTunnelConnectionParams in VcnGatewayConnectionConfig#hashCode and VcnGatewayConnectionConfig#equals. This commit fixes the issue that VcnGatewayConnection was not being restarted as expected. Bug: 191317512 Test: atest FrameworksVcnTests (new tests added) Test: atest CtsVcnTestCases Original-Change: https://android-review.googlesource.com/1742657 Merged-In: I70182f9b645e55eced1e0a048a1bd87778c1c0f6 Change-Id: I70182f9b645e55eced1e0a048a1bd87778c1c0f6
2021-06-18Update Mobile Data State on subscription changes.Cody Kesting
This CL ensures that Vcn instances refresh their mobile data state when they receive a new TelephonySubscriptionSnapshot. A new snapshot may contain different subId -> subGroup mappings, which can affect whether a Vcn instance's subGroup has mobile data enabled or not. This in turn can change which VcnGatewayConnections are brought up by the Vcn. Bug: 191394092 Test: atest FrameworksVcnTests CtsVcnTestCases Original-Change: https://android-review.googlesource.com/1740514 Merged-In: Ib59b4ed7900a177b17ed4a6e197e271b10937f65 Change-Id: Ib59b4ed7900a177b17ed4a6e197e271b10937f65
2021-06-14Allow MANAGE_TEST_NETWORKS to register and get VCN policies.Cody Kesting
This CL updates VcnManagementService to allow permission MANAGE_TEST_NETWORKS to register/unregister VCN policy listers as well as apply VCN policies. Previously, only permission NETWORK_FACTORY was allowed to perform this operations. Bug: 189125789 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: I6ad3a58f4ef87d931917fbd772a810af81b27da1 Merged-In: I6ad3a58f4ef87d931917fbd772a810af81b27da1 (cherry picked from commit f658c7f394adc2af459afd60c8a6dbe7e20c0584)
2021-05-25Remove underlying network capsBenedict Wong
This change removes unused fields in the persistable bundle and VcnGatewayConnectionConfig classes to ensure future flexibility. Bug: 182219992 Test: atest FrameworksVcnTests Change-Id: Ic2fec8a87fd19a1780333c61759c4092598d349e Merged-In: Ic2fec8a87fd19a1780333c61759c4092598d349e (cherry picked from commit 1f06b95c6288c317e302714f18b30d44b157ed77)
2021-05-24Copy up/downstream bandwidth and TCP buffer sizes from underlyingBenedict Wong
This change copies the relevant pieces of information used to tune the system for performance Bug: 188943592 Test: atest FrameworksVcnTests Change-Id: I2d5dc5b9000fa9d0da9d34772b3704110694c526
2021-05-14Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-devBenedict Wong
2021-05-14Make VcnTransportInfo unparcel to null if no data containedBenedict Wong
When VcnTransportInfo is redacted, it contains no useful information. In order to preserve the abstraction, the VcnTransportInfo should be unparcelled to null Bug: 8675309 Test: atest VcnTransportInfoTest Change-Id: Ia9dbb9f259027acc74004eb1207e0a13cea56088
2021-05-14Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 am: 2a86eae65eBenedict Wong
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226 Change-Id: Icdf319d564e4eab468d9d4e722716a2ef7d2c3cd
2021-05-13Custom network selectionBenedict Wong
This change adds a basic prioritization framework in the VCN, and signal strength thresholds for WiFi. Bug: 188104094 Test: atest FrameworksVcnTests Change-Id: Iee4e3dbecf1102ddc127a8c8daf08a00b6fccbbd
2021-05-13Make VcnTransportInfoTest pass on AOSP.Lorenzo Colitti
AOSP contains the core networking redaction changes, but not the wifi redaction changes, so the tests that depend on wifi S behaviour will not pass on AOSP. Fix testApplicableRedactions by checking that the applicable redactions are the same ones as returned by the underlying WifiInfo object. Fix testMakeCopyRedactForAccessFineLocation by testing the wifi redaction code iff Build.VERSION.SDK_INT is S or later. This is different from SdkLevel.isAtLeastS, because the latter returns true in AOSP. Bug: 183938194 Test: atest VcnTransportInfoTest Change-Id: Ia5bc896c92be19f570638f8051492e0f2d7342f9
2021-05-13Immediately redact VcnTransportInfo.Lorenzo Colitti
Redaction of NetworkCapabilities is changing from redacting at parcel time to redacting immediately when makeCopy() is called. Update VcnTransportInfo redaction accordingly. Bug: 183938194 Test: atest VcnTransportInfoTest Change-Id: I0c9406f426b66fd36b47d11799955def531c16ba
2021-05-12Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 am: 5cdc27d2acCody Kesting
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175 Change-Id: I7d636497dbc26008e659495e4236f161c90599ab
2021-05-12Merge changes I4b135749,If4fcaa52Cody Kesting
* changes: Restructure Test Network requests for VCN connections. Correct variable name in VcnManagementService.
2021-05-12Merge changes from topic "transportinfo-explicit-redaction" into sc-devLorenzo Colitti
* changes: Immediately redact VcnTransportInfo. Do not automatically redact TransportInfo objects.
2021-05-12Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 am: b79dcb24d0 am: ↵Treehugger Robot
5804521e8c am: 32c2d34383 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700309 Change-Id: Ifab0469fb2687cae7b361b5009abe152a35048c5
2021-05-12Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8Treehugger Robot
* changes: Request Test Networks for VCNs when in Test Mode. Specify if a VCN is in 'test-mode' in VcnContext. Create test-mode for VcnConfig. Require MOBIKE for IkeSessionParams in VCN configs.
2021-05-11Restructure Test Network requests for VCN connections.Cody Kesting
This CL restructures the NetworkRequests used for TestNetworks in UnderlyingNetworkTracker to clearly show that they only require TRANSPORT_TEST and the relevant subIds. Bug: 182291467 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: I4b135749fdde9f91c66b87b1ded921700e6440fd
2021-05-11Request Test Networks for VCNs when in Test Mode.Cody Kesting
This CL updates UnderlyingNetworkTracker to request Test Networks for route selection when the VCN it is tracking for is in test-mode. Bug: 182291467 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: Icb59b15df61ec43fe76e250977a985caa6a1dffc
2021-05-11Specify if a VCN is in 'test-mode' in VcnContext.Cody Kesting
This CL updates VcnContext to include whether the VCN instance it is created for is in test-mode (as specified by the VcnConfig). This also changes the lifetime of VcnContext to be created uniquely for each VCN instance (as opposed to a single VcnContext created in VcnManagementService and used for all VCNs). Bug: 182291467 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: I6fc6a266bf67ab2aa64202153c3c109ee98a16ca
2021-05-11Create test-mode for VcnConfig.Cody Kesting
This CL creates a test-mode for VcnConfig so that they will only match with Test Networks. This is necessary for CTS testing so that VCNs can run on test networks and IKE negotiations can be injected over the Test Networks. Bug: 182291467 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: I5cc340e5aaa34c5de8efafa52de49185a18d4bd3
2021-05-11Require MOBIKE for IkeSessionParams in VCN configs.Cody Kesting
This CL updates VcnGatewayConnectionConfigs to require IkeTunnelConnectionParams with MOBIKE enabled for the IkeSessionParams. This is necessary for VCNs - without it, they do not support IPsec mobility (one of the main features of the VCN). Bug: 187851560 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: I94db52a8c42d9fa4681fefb8f787f006933caa18
2021-05-11Immediately redact VcnTransportInfo.Lorenzo Colitti
Redaction of NetworkCapabilities is changing from redacting at parcel time to redacting immediately when makeCopy() is called. Update VcnTransportInfo redaction accordingly. Bug: 183938194 Test: atest VcnTransportInfoTest Change-Id: I0c9406f426b66fd36b47d11799955def531c16ba
2021-05-11Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32 am: 600401154aBenedict Wong
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047 Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
2021-05-07Apply transform to FWD policy if configured to provide tetheringBenedict Wong
This change allows the VCN to trigger the application of IpSecTransforms as in the FWD path, ensuring that tethering works across interfaces Bug: 185495453 Test: atest FrameworksVcnTests Test: manual testing with cross-device tethering Change-Id: I90fc77226ca971dbd8ac549b96a4828da1079cd5
2021-05-05Merge changes I01ffdde2,Iecab1226 am: a5786a15e1 am: cbf91b3e8c am: 88d6f01baeCody Kesting
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696089 Change-Id: I7888e363733ac767c43a5b6c716b45da81544830
2021-05-05Merge changes I01ffdde2,Iecab1226Cody Kesting
* changes: Set NOT_VCN_MANAGED capability for Networks in VcnMgmtSvc. Notify policy listeners when VCN subIds change.
2021-05-04Notify policy listeners when VCN subIds change.Cody Kesting
This CL updates VcnManagementService to notify policy listeners when the subIds for any VCN instances change. This is necessary to ensure that NetworkFactories properly update their Networks in the event that a Network comes up under an existing VCN are properly marked as VCN-managed. Bug: 187112989 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: Iecab1226119c8fd876131c381647267f18339db2
2021-05-01Merge "Trigger reevaluation of all requests when mobile data state changes" ↵Treehugger Robot
am: 5a2abf1341 am: aa5e3e2164 am: 0ad647a679 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692660 Change-Id: I9677e4ba520f55df0149359f4f02c33747dc0462
2021-04-30Trigger reevaluation of all requests when mobile data state changesBenedict Wong
This change ensures mobile data state changes result in the reevaluation of all NetworkRequests; ensuring that any requests that can be fulfilled as a result of the mobile data state change start the relevant GatewayConnections Test: atest FrameworksVcnTests Change-Id: I442ca2ee0fc8b9ad962a2491ddc3818535d9e042
2021-04-29Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: ↵Benedict Wong
058149884f am: 33d2807b02 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783 Change-Id: Ica36f177bcb4a1d6625a0bf14288f6acd3ea4224
2021-04-29Merge "Update set|getRetryIntervalsMs to Millis"Benedict Wong
2021-04-28Merge "Set safe mode alarm when validation reports NOT_VALID" am: 19be41cb30 ↵Benedict Wong
am: 5bf42637a8 am: d5af4baf80 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689285 Change-Id: Id5c0d8688d3c9be59b66d253161b8e8c941556eb
2021-04-28Merge "Allow VcnTransportInfo to be parcelled" am: eecd1d9ca5 am: 3e633b7822 ↵Benedict Wong
am: 13ffa97a76 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686985 Change-Id: If4f26b60f10be868ae0763a4fcccb61695d39151
2021-04-28Merge "Set safe mode alarm when validation reports NOT_VALID"Benedict Wong
2021-04-27Allow VcnTransportInfo to be parcelledBenedict Wong
Allows VCN transport info to be parcelled for purposes of sysUI Bug: 186025257 Test: atest FrameworksVcnTests Change-Id: I5a5d9b88659c8dcaa9ded16d491b2bac0529169a
2021-04-27Update set|getRetryIntervalsMs to MillisBenedict Wong
Bug: 184612525 Test: atest FrameworksVcnTests Change-Id: I696854960ca9488ae2c8a0c569c57a8563998ac8
2021-04-27Set safe mode alarm when validation reports NOT_VALIDBenedict Wong
Bug: 186257328 Test: atest FrameworksVcnTests Change-Id: I80f37d42e4d61026b3521a4133257cd472c22f1a
2021-04-27Merge "Remove TunnelConnectionParams interface" am: b8f67d1bd7 am: ↵Yan Yan
b1578de55a am: 92154c7465 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684427 Change-Id: I546b7eecca41d2a745b65f67961a2634be29609f
2021-04-26Remove TunnelConnectionParams interfaceYan Yan
To avoid exposing empty interface. Test: atest FrameworksVcnTests Bug: 180664474 Change-Id: Ia33e75b77f1563a1c3d31e0145b7ec2be728b6db
2021-04-22Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", ↵Yan Yan
"vcn-encrypted-tunnel" am: bc545c8a8a am: 7a52d5a3eb am: 1df96ea6ac Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997 Change-Id: If056d1a90cc4dce3882168ca23302fcd086b40ae
2021-04-22Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a am: ↵Yan Yan
e80e82bb67 am: 7a961913b2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048 Change-Id: Idbd09b9f8a7143e586b23db47bcffcd0b82ea0c0