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

Commit 6befc71e authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Add MOBILE_DATA_POLICY_AUTO_DATA_SWITCH"

parents da762f62 837daa5c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13734,6 +13734,7 @@ package android.telephony { 
    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

    field public static final int KEY_TYPE_EPDG = 1; // 0x1

    field public static final int KEY_TYPE_WLAN = 2; // 0x2

    field public static final int MOBILE_DATA_POLICY_AUTO_DATA_SWITCH = 3; // 0x3

    field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1

    field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2

    field public static final int NR_DUAL_CONNECTIVITY_DISABLE = 2; // 0x2

telephony/common/com/android/internal/telephony/util/TelephonyUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ public final class TelephonyUtils { 
                return "DATA_ON_NON_DEFAULT_DURING_VOICE_CALL";

            case TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED:

                return "MMS_ALWAYS_ALLOWED";

            case TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH:

                return "AUTO_DATA_SWITCH";

            default:

                return "UNKNOWN(" + mobileDataPolicy + ")";

        }

telephony/java/android/telephony/TelephonyManager.java

+18 −0
Original line number Diff line number Diff line
@@ -15626,12 +15626,30 @@ public class TelephonyManager { 
    @SystemApi

    public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2;













    /**













     * Allow switching mobile data to the non-default SIM if the non-default SIM has better













     * availability.













     *













     * This is used for temporarily allowing data on the non-default data SIM when on-default SIM













     * has better availability on DSDS devices, where better availability means strong













     * signal/connectivity.













     * If this policy is enabled, data will be temporarily enabled on the non-default data SIM,













     * including during any voice calls(equivalent to enabling













     * {@link #MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL}).













     *













     * This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabled}.













     * @hide













     */













    @SystemApi













    public static final int MOBILE_DATA_POLICY_AUTO_DATA_SWITCH = 3;



























    /**















     * @hide















     */















    @IntDef(prefix = { "MOBILE_DATA_POLICY_" }, value = {















            MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,















            MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED,













            MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface MobileDataPolicy { }