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

Commit 72402945 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Unthrottle data retry in some conditions" into sc-dev

parents 5c2e01f7 c8cf1b02

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -4929,6 +4929,14 @@ public class CarrierConfigManager { 
    public static final String KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL =

            "display_no_data_notification_on_permanent_failure_bool";



    /**

     * Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes

     *

     * @hide

     */

    public static final String KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL =

            "unthrottle_data_retry_when_tac_changes_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -5509,6 +5517,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true);

        sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, "");

        sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false);

        sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false);

    }



    /**

telephony/java/com/android/internal/telephony/DctConstants.java

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ public class DctConstants { 
    public static final int EVENT_CARRIER_CONFIG_CHANGED = BASE + 54;

    public static final int EVENT_SIM_STATE_UPDATED = BASE + 55;

    public static final int EVENT_APN_UNTHROTTLED = BASE + 56;

    public static final int EVENT_AIRPLANE_MODE_CHANGED = BASE + 57;



    /***** Constants *****/