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 am: bd0882f00f

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

Change-Id: If81baa3160a66a6805cf70b4bd042f185f83aa5f
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:59:14 +00:00
committed by Automerger Merge Worker
parent 0aecd3da5b bd0882f00f
commit 843653af00
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.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -134,7 +133,7 @@ public final class VcnGatewayConnectionConfig {
/**
* 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
* performing a mobility update on the underlying IKE session.
*/
@@ -243,7 +242,7 @@ public final class VcnGatewayConnectionConfig {
mExposedCapabilities = new TreeSet(exposedCapabilities);
mRetryIntervalsMs = retryIntervalsMs;
mMaxMtu = maxMtu;
mGatewayOptions = Collections.unmodifiableSet(new HashSet(gatewayOptions));
mGatewayOptions = Collections.unmodifiableSet(new ArraySet(gatewayOptions));
mUnderlyingNetworkTemplates = new ArrayList<>(underlyingNetworkTemplates);
if (mUnderlyingNetworkTemplates.isEmpty()) {
@@ -294,7 +293,7 @@ public final class VcnGatewayConnectionConfig {
mGatewayOptions = Collections.emptySet();
} else {
mGatewayOptions =
new HashSet<>(
new ArraySet<>(
PersistableBundleUtils.toList(
gatewayOptionsBundle,
PersistableBundleUtils.INTEGER_DESERIALIZER));