Merge "[Suggestion] Add Api to get carrier Id"

3 files changed, 30 insertions, 0 deletions

diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index aeac9a00f7..93855870a9 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -674,6 +674,7 @@ package android.net.wifi {
   }
 
   public final class WifiNetworkSuggestion implements android.os.Parcelable {
+    method public int getCarrierId();
     method @NonNull public android.net.wifi.WifiConfiguration getWifiConfiguration();
     method public boolean isOemPaid();
     method public boolean isOemPrivate();
diff --git a/framework/java/android/net/wifi/WifiNetworkSuggestion.java b/framework/java/android/net/wifi/WifiNetworkSuggestion.java
index 477b023076..8e124a2392 100644
--- a/framework/java/android/net/wifi/WifiNetworkSuggestion.java
+++ b/framework/java/android/net/wifi/WifiNetworkSuggestion.java
@@ -1420,4 +1420,16 @@ public final class WifiNetworkSuggestion implements Parcelable {
         }
         return wifiConfiguration.subscriptionId;
     }
+
+    /**
+     * @see Builder#setCarrierId(int)
+     * @hide
+     */
+    @SystemApi
+    public int getCarrierId() {
+        if (!SdkLevel.isAtLeastS()) {
+            throw new UnsupportedOperationException();
+        }
+        return wifiConfiguration.carrierId;
+    }
 }
diff --git a/framework/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java b/framework/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
index ddbbdd4ff6..35c0db7d7e 100644
--- a/framework/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
+++ b/framework/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
@@ -52,6 +52,7 @@ public class WifiNetworkSuggestionTest {
     private static final String TEST_DOMAIN_SUFFIX_MATCH = "domainSuffixMatch";
     private static final int DEFAULT_PRIORITY_GROUP = 0;
     private static final int TEST_PRIORITY_GROUP = 1;
+    private static final int TEST_CARRIER_ID = 1998;
 
     /**
      * Validate correctness of WifiNetworkSuggestion object created by
@@ -1535,4 +1536,20 @@ public class WifiNetworkSuggestionTest {
                 .setSubscriptionId(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
                 .build();
     }
+
+    /**
+     * Test set and get carrier Id
+     */
+    @Test
+    public void testSetCarrierId() {
+        assumeTrue(SdkLevel.isAtLeastS());
+
+        WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder()
+                .setSsid(TEST_SSID)
+                .setWpa2Passphrase(TEST_PRESHARED_KEY)
+                .setCarrierId(TEST_CARRIER_ID)
+                .build();
+
+        assertEquals(TEST_CARRIER_ID, suggestion.getCarrierId());
+    }
 }