Snap for 11220357 from 05d8a25f066c9c096d5f94b57558d880922d7643 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ic91f805dc3a578bad764fcd28904928e0ff893b2

5 files changed, 54 insertions, 8 deletions

diff --git a/flags/misc.aconfig b/flags/misc.aconfig
index 7f40596014..835efeefce 100644
--- a/flags/misc.aconfig
+++ b/flags/misc.aconfig
@@ -51,13 +51,6 @@ flag {
 }
 
 flag {
-  name: "load_dds_on_create"
-  namespace: "telephony"
-  description: "Load default data subid on create in PhoneGlobals."
-  bug: "310591561"
-}
-
-flag {
   name: "enable_telephony_analytics"
   namespace: "telephony"
   description: "Enable Telephony Analytics information of Service State , Sms and Call scenarios"
diff --git a/flags/telephony.aconfig b/flags/telephony.aconfig
index f60885b5f9..b849d53e64 100644
--- a/flags/telephony.aconfig
+++ b/flags/telephony.aconfig
@@ -5,4 +5,11 @@ flag {
     namespace: "telephony"
     description: "This flag controls telephony feature flags mapping."
     bug:"297989574"
-}
\ No newline at end of file
+}
+
+flag {
+    name: "enforce_telephony_feature_mapping_for_public_apis"
+    namespace: "telephony"
+    description: "This flag controls telephony feature flags mapping for public APIs and CTS."
+    bug:"297989574"
+}
diff --git a/flags/uicc.aconfig b/flags/uicc.aconfig
index 3ef2301650..b2024b006e 100644
--- a/flags/uicc.aconfig
+++ b/flags/uicc.aconfig
@@ -11,4 +11,10 @@ flag {
     namespace: "telephony"
     description: "This flag controls to download the IMSI encryption keys after user unlocks the phone."
     bug:"303780982"
+}
+flag {
+    name: "carrier_restriction_status"
+    namespace: "telephony"
+    description: "This flag control the visibility of the getCarrierRestrictionStatus in carrierRestrictionRules class."
+    bug:"313553044"
 }
\ No newline at end of file
diff --git a/tests/telephonytests/src/com/android/internal/telephony/data/ApnSettingTest.java b/tests/telephonytests/src/com/android/internal/telephony/data/ApnSettingTest.java
index 98d3ce5b61..378df4b944 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/data/ApnSettingTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/data/ApnSettingTest.java
@@ -16,6 +16,9 @@
 
 package com.android.internal.telephony.data;
 
+import static android.telephony.data.ApnSetting.INFRASTRUCTURE_CELLULAR;
+import static android.telephony.data.ApnSetting.INFRASTRUCTURE_SATELLITE;
+
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
@@ -381,4 +384,34 @@ public class ApnSettingTest extends TelephonyTest {
                 .build();
         assertEquals("proxy.mobile.att.net", apn3.getMmsProxyAddressAsString());
     }
+
+    @Test
+    public void testBuild_InfrastructureBitmask() {
+        int infrastructureBitmask = INFRASTRUCTURE_CELLULAR | INFRASTRUCTURE_SATELLITE;
+        ApnSetting apn1 = new ApnSetting.Builder()
+                .setId(1234)
+                .setOperatorNumeric("310260")
+                .setEntryName("mms")
+                .setApnName("mms")
+                .setApnTypeBitmask(ApnSetting.TYPE_MMS | ApnSetting.TYPE_DEFAULT)
+                .setProtocol(ApnSetting.PROTOCOL_IPV4V6)
+                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_LTE))
+                .build();
+        // InfrastructureBitmask default value set to '3(cellular|satellite)'
+        assertEquals(infrastructureBitmask, apn1.getInfrastructureBitmask());
+
+        infrastructureBitmask = INFRASTRUCTURE_CELLULAR;
+        ApnSetting apn2 = new ApnSetting.Builder()
+                .setId(1235)
+                .setOperatorNumeric("310260")
+                .setEntryName("mms")
+                .setApnName("mms")
+                .setApnTypeBitmask(ApnSetting.TYPE_MMS | ApnSetting.TYPE_DEFAULT)
+                .setProtocol(ApnSetting.PROTOCOL_IPV4V6)
+                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_LTE))
+                .setInfrastructureBitmask(infrastructureBitmask)
+                .build();
+        // InfrastructureBitmask value set to '1(cellular)'
+        assertEquals(infrastructureBitmask, apn2.getInfrastructureBitmask());
+    }
 }
diff --git a/tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java b/tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java
index ff14f9a262..e556cb877e 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java
@@ -1611,6 +1611,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                                 | TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(DEFAULT_APN_SET_ID)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();
 
@@ -1646,6 +1647,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                         .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(DEFAULT_APN_SET_ID)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();
 
@@ -1674,6 +1676,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                                 | TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(APN_SET_ID_1)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();
 
@@ -1702,6 +1705,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                                 | TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(MATCH_ALL_APN_SET_ID)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();
 
@@ -1737,6 +1741,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                                 | TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(APN_SET_ID_1)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();
 
@@ -1765,6 +1770,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                         .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(DEFAULT_APN_SET_ID)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();
 
@@ -1793,6 +1799,7 @@ public class DataProfileManagerTest extends TelephonyTest {
                                 | TelephonyManager.NETWORK_TYPE_BITMASK_NR))
                         .setMvnoMatchData("")
                         .setApnSetId(MATCH_ALL_APN_SET_ID)
+                        .setInfrastructureBitmask(1)
                         .build())
                 .build();