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

Commit fa3365ef authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "[Satellite] Introduced satellite connected notification throttle time to 7 days." into main

parents 5b139513 42c4be8d

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45170,6 +45170,7 @@ package android.telephony { 
    field public static final String KEY_RTT_UPGRADE_SUPPORTED_BOOL = "rtt_upgrade_supported_bool";

    field public static final String KEY_RTT_UPGRADE_SUPPORTED_FOR_DOWNGRADED_VT_CALL_BOOL = "rtt_upgrade_supported_for_downgraded_vt_call";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ATTACH_SUPPORTED_BOOL = "satellite_attach_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_25q4_apis") public static final String KEY_SATELLITE_CONNECTED_NOTIFICATION_THROTTLE_MILLIS_INT = "satellite_connected_notification_throttle_millis_int";

    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.satellite_system_apis") public static final String KEY_SATELLITE_DATA_SUPPORT_MODE_INT = "satellite_data_support_mode_int";

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_SATELLITE_DISPLAY_NAME_STRING = "satellite_display_name_string";

telephony/java/android/telephony/CarrierConfigManager.java

+15 −0
Original line number Diff line number Diff line
@@ -10206,6 +10206,17 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_SUPPORTED_SATELLITE_NOTIFICATION_HYSTERESIS_SEC_INT =

            "carrier_supported_satellite_notification_hysteresis_sec_int";













    /**













     * Satellite notification display restriction reset time in seconds.













     *













     * The device shows a notification when it connects to a satellite.  If the user interacts













     * with the notification, it won't be shown again immediately.  Instead, the notification













     * will only reappear after below key mentioned amount of time has passed.













     */













    @FlaggedApi(Flags.FLAG_SATELLITE_25Q4_APIS)













    public static final String KEY_SATELLITE_CONNECTED_NOTIFICATION_THROTTLE_MILLIS_INT =













            "satellite_connected_notification_throttle_millis_int";



























    /**















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















     * carrier-roaming NB-IOT satellite mode.










@@ -11428,6 +11439,10 @@ public class CarrierConfigManager {













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













        if (Flags.starlinkDataBugfix()) {













            sDefaults.putLong(KEY_SATELLITE_CONNECTED_NOTIFICATION_THROTTLE_MILLIS_INT,













                    TimeUnit.DAYS.toMillis(7));













        }















        sDefaults.putInt(KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT, 30);















        sDefaults.putInt(KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT, 180);















        sDefaults.putInt(KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT, 600);