commit 3a891e9a45502de2530b0be4dfabca5c927222b6
author Ling Ma <linggm@google.com> Tue Mar 15 09:45:58 2022 -0700
committer Ling Ma <linggm@google.com> Tue Mar 15 14:15:10 2022 -0700
tree eca710e55273247743660bb1c84377d4d4f892c1
parent 2d5319891fdfa58d0b0c69b0f227d91ce55483c9

Unhide API isPersistent and getProfileId

Test: cts ApnSettingTest
Bug: 223599330
Change-Id: I33dc735923910f5ca4bb53c4737b5550d5787a93

tests/tests/telephony/current/src/android/telephony/cts/ApnSettingTest.java

diff --git a/tests/tests/telephony/current/src/android/telephony/cts/ApnSettingTest.java b/tests/tests/telephony/current/src/android/telephony/cts/ApnSettingTest.java
index bb25a89..8a70e42 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/ApnSettingTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/ApnSettingTest.java
@@ -17,7 +17,10 @@
 package android.telephony.cts;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import android.net.Uri;
+import android.telephony.TelephonyManager;
 import android.telephony.data.ApnSetting;
 import android.util.ArrayMap;
 
@@ -75,4 +78,76 @@
             assertEquals((int) e.getValue(), ApnSetting.getApnTypeInt(e.getKey()));
         }
     }
+
+    @Test
+    public void testBuilderGet() {
+        int apnTypeBitMask = ApnSetting.TYPE_DEFAULT;
+        int profileId = 9;
+        int mtuV4 = 1;
+        int mtuV6 = 2;
+        int proxyPort = 5;
+        int mmsPort = 3;
+        int authType = ApnSetting.AUTH_TYPE_NONE;
+        int protocol = ApnSetting.PROTOCOL_IP;
+        int networkTypeBitmask =  (int) TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
+        int roamingProtocol = 1;
+        int mvnoType = ApnSetting.MVNO_TYPE_SPN;
+        int carrierId = 123;
+        boolean isPersistent = true;
+        boolean carrierEnabled = true;
+        Uri mmsc = new Uri.Builder().build();
+        String mmsProxy = "12.34.56";
+        String proxyAddress = "11.22.33.44";
+        String apnName = "testApnName";
+        String entryName = "entryName";
+        String user = "testUser";
+        String password = "testPWD";
+        String operatorNumeric = "123";
+        ApnSetting apnSettingUT = new ApnSetting.Builder()
+                .setApnTypeBitmask(apnTypeBitMask)
+                .setApnName(apnName)
+                .setEntryName(entryName)
+                .setMtuV4(mtuV4)
+                .setMtuV6(mtuV6)
+                .setProxyPort(proxyPort)
+                .setMmsProxyPort(mmsPort)
+                .setAuthType(authType)
+                .setProtocol(protocol)
+                .setNetworkTypeBitmask(networkTypeBitmask)
+                .setRoamingProtocol(roamingProtocol)
+                .setMvnoType(mvnoType)
+                .setCarrierId(carrierId)
+                .setCarrierEnabled(carrierEnabled)
+                .setProfileId(profileId)
+                .setPersistent(isPersistent)
+                .setMmsc(mmsc)
+                .setMmsProxyAddress(mmsProxy)
+                .setProxyAddress(proxyAddress)
+                .setUser(user)
+                .setPassword(password)
+                .setOperatorNumeric(operatorNumeric)
+                .build();
+        assertEquals(apnTypeBitMask, apnSettingUT.getApnTypeBitmask());
+        assertEquals(profileId, apnSettingUT.getProfileId());
+        assertEquals(mtuV4, apnSettingUT.getMtuV4());
+        assertEquals(mtuV6, apnSettingUT.getMtuV6());
+        assertEquals(proxyPort, apnSettingUT.getProxyPort());
+        assertEquals(mmsPort, apnSettingUT.getMmsProxyPort());
+        assertEquals(authType, apnSettingUT.getAuthType());
+        assertEquals(protocol, apnSettingUT.getProtocol());
+        assertEquals(networkTypeBitmask, apnSettingUT.getNetworkTypeBitmask());
+        assertEquals(roamingProtocol, apnSettingUT.getRoamingProtocol());
+        assertEquals(mvnoType, apnSettingUT.getMvnoType());
+        assertEquals(carrierId, apnSettingUT.getCarrierId());
+        assertEquals(mmsc, apnSettingUT.getMmsc());
+        assertEquals(mmsProxy, apnSettingUT.getMmsProxyAddressAsString());
+        assertEquals(proxyAddress, apnSettingUT.getProxyAddressAsString());
+        assertEquals(apnName, apnSettingUT.getApnName());
+        assertEquals(entryName, apnSettingUT.getEntryName());
+        assertEquals(user, apnSettingUT.getUser());
+        assertEquals(password, apnSettingUT.getPassword());
+        assertEquals(operatorNumeric, apnSettingUT.getOperatorNumeric());
+        assertTrue(apnSettingUT.isPersistent());
+        assertTrue(apnSettingUT.isEnabled());
+    }
 }