Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a typo and use ArraySet in VCN" am: e60e0a8b75

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2355953

Change-Id: I87aa88c561109ccbc24c88dfa00e84905d2e9d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yan Yan
2022-12-15 01:25:29 +00:00
committed by Automerger Merge Worker
parent 38f2d28610 e60e0a8b75
commit bd0882f00f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/vcn/VcnGatewayConnectionConfig.java
View File

@@ -42,7 +42,6 @@ import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@@ -134,7 +133,7 @@ public final class VcnGatewayConnectionConfig {
/** /**
* Perform mobility update to attempt recovery from suspected data stalls. * Perform mobility update to attempt recovery from suspected data stalls.
* *
* <p>If set, the gatway connection will monitor the data stall detection of the VCN network. * <p>If set, the gateway connection will monitor the data stall detection of the VCN network.
* When there is a suspected data stall, the gateway connection will attempt recovery by * When there is a suspected data stall, the gateway connection will attempt recovery by
* performing a mobility update on the underlying IKE session. * performing a mobility update on the underlying IKE session.
*/ */
@@ -243,7 +242,7 @@ public final class VcnGatewayConnectionConfig {
mExposedCapabilities = new TreeSet(exposedCapabilities); mExposedCapabilities = new TreeSet(exposedCapabilities);
mRetryIntervalsMs = retryIntervalsMs; mRetryIntervalsMs = retryIntervalsMs;
mMaxMtu = maxMtu; mMaxMtu = maxMtu;
mGatewayOptions = Collections.unmodifiableSet(new HashSet(gatewayOptions)); mGatewayOptions = Collections.unmodifiableSet(new ArraySet(gatewayOptions));
mUnderlyingNetworkTemplates = new ArrayList<>(underlyingNetworkTemplates); mUnderlyingNetworkTemplates = new ArrayList<>(underlyingNetworkTemplates);
if (mUnderlyingNetworkTemplates.isEmpty()) { if (mUnderlyingNetworkTemplates.isEmpty()) {
@@ -294,7 +293,7 @@ public final class VcnGatewayConnectionConfig {
mGatewayOptions = Collections.emptySet(); mGatewayOptions = Collections.emptySet();
} else { } else {
mGatewayOptions = mGatewayOptions =
new HashSet<>( new ArraySet<>(
PersistableBundleUtils.toList( PersistableBundleUtils.toList(
gatewayOptionsBundle, gatewayOptionsBundle,
PersistableBundleUtils.INTEGER_DESERIALIZER)); PersistableBundleUtils.INTEGER_DESERIALIZER));