Merge "Add carrier config item for P2P SMS and ESOS inactivity timeout value... (0dcd04e1) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -43968,8 +43968,11 @@ package android.telephony {
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT = "satellite_connection_hysteresis_sec_int";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT = "satellite_entitlement_status_refresh_days_int";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL = "satellite_entitlement_supported_bool";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_esos_inactivity_timeout_sec_int";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT = "satellite_screen_off_inactivity_timeout_duration_sec_int";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_p2p_sms_inactivity_timeout_sec_int";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL = "satellite_roaming_p2p_sms_supported_bool";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT = "satellite_screen_off_inactivity_timeout_sec_int";
		field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";
		field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";
		field public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+43 −1

Original line number	Diff line number	Diff line
		@@ -9993,6 +9993,17 @@ public class CarrierConfigManager {
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";

		/**
		* Indicate whether carrier roaming to satellite is using P2P SMS.
		*
		* This will need agreement with carriers before enabling this flag.
		*
		* The default value is false.
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public static final String KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL =
		"satellite_roaming_p2p_sms_supported_bool";

		/**
		* Defines the NIDD (Non-IP Data Delivery) APN to be used for carrier roaming to satellite
		* attachment. For more on NIDD, see 3GPP TS 29.542.
		@@ -10075,7 +10086,35 @@ public class CarrierConfigManager {
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public static final String KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT =
		"satellite_screen_off_inactivity_timeout_duration_sec_int";
		"satellite_screen_off_inactivity_timeout_sec_int";

		/**
		* An integer key holds the timeout duration in seconds used to determine whether to exit P2P
		* SMS mode and start TN scanning.
		*
		* The timer is started when the device is not connected, user is not pointing to the
		* satellite and no data transfer is happening.
		* When the timer expires, the device will move to IDLE mode upon which TN scanning will start.
		*
		* The default value is 180 seconds.
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public static final String KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT =
		"satellite_p2p_sms_inactivity_timeout_sec_int";

		/**
		* An integer key holds the timeout duration in seconds used to determine whether to exit ESOS
		* mode and start TN scanning.
		*
		* The timer is started when the device is not connected, user is not pointing to the
		* satellite and no data transfer is happening.
		* When the timer expires, the device will move to IDLE mode upon which TN scanning will start.
		*
		* The default value is 600 seconds.
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public static final String KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT =
		"satellite_esos_inactivity_timeout_sec_int";

		/**
		* Indicating whether DUN APN should be disabled when the device is roaming. In that case,
		@@ -11235,12 +11274,15 @@ public class CarrierConfigManager {
		sDefaults.putInt(KEY_EMERGENCY_CALL_TO_SATELLITE_T911_HANDOVER_TIMEOUT_MILLIS_INT,
		(int) TimeUnit.SECONDS.toMillis(30));
		sDefaults.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);
		sDefaults.putBoolean(KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL, false);
		sDefaults.putString(KEY_SATELLITE_NIDD_APN_NAME_STRING, "");
		sDefaults.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, 0);
		sDefaults.putInt(KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT,
		SatelliteManager.EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911);
		sDefaults.putInt(KEY_CARRIER_SUPPORTED_SATELLITE_NOTIFICATION_HYSTERESIS_SEC_INT, 180);
		sDefaults.putInt(KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT, 30);
		sDefaults.putInt(KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT, 180);
		sDefaults.putInt(KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT, 600);
		sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
		sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);
		sDefaults.putBoolean(KEY_SUPPORTS_BUSINESS_CALL_COMPOSER_BOOL, false);