Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a143958 authored by joonhunshin's avatar joonhunshin Committed by Aishwarya Mallampati
Browse files

Add carrier config item KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT for satellite 

Bug: 350518479
Test: atest CarrierConfigManagerTest
      manual test in demo and real network (b/355117404)
Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn
Change-Id: I999b6cba31671a2664f317891f334ea4a8e3f3bf
parent 7b588fe2

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43911,6 +43911,7 @@ package android.telephony { 
    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_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 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

+14 −0
Original line number Diff line number Diff line
@@ -10037,6 +10037,19 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_SUPPORTED_SATELLITE_NOTIFICATION_HYSTERESIS_SEC_INT =

            "carrier_supported_satellite_notification_hysteresis_sec_int";













    /**













     * An integer key holds the timeout duration in seconds used to determine whether to exit













     * carrier-roaming NB-IOT satellite mode.













     *













     * The timer is started when the device screen is turned off during a satellite session.













     * When the timer expires, the device exits Carrier Roaming NB IOT NTN.













     *













     * The default value is 30 seconds.













     */













    @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";



























    /**















     * Indicating whether DUN APN should be disabled when the device is roaming. In that case,















     * the default APN (i.e. internet) will be used for tethering.










@@ -11197,6 +11210,7 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);















        sDefaults.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, 0);















        sDefaults.putInt(KEY_CARRIER_SUPPORTED_SATELLITE_NOTIFICATION_HYSTERESIS_SEC_INT, 180);













        sDefaults.putInt(KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT, 30);















        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);