From 6cc63c4968eda6f7a79fa80d469fddcb911a588f Mon Sep 17 00:00:00 2001
From: Yan Yan <evitayan@google.com>
Date: Wed, 14 Dec 2022 18:42:55 +0000
Subject: [PATCH] Fix a typo and use ArraySet in VCN

This is a cleanup commit to fix typos and switch to use ArraySet
instead of HashSet for better performance.

Bug: 261499808
Test: atest FrameworksVcnTests, CtsVcnTestCases
Change-Id: Ie4a83ab22aa2b3682856776b762b4356b13b4745
---
 core/java/android/net/vcn/VcnGatewayConnectionConfig.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
index b8850f427cfc8..4c9d150ec4862 100644
--- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
+++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
@@ -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));