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

Commit 2e0ea1ab authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge changes from topics "128455935", "123661746" am: dc4cb81c 

am: 1c906d42

Change-Id: I745f66fc63d03e2ccf03b47daae56f219252d87b
parents 37c9ced0 1c906d42

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43246,7 +43246,7 @@ package android.telephony { 
    field public static final int PHONE_TYPE_GSM = 1; // 0x1

    field public static final int PHONE_TYPE_NONE = 0; // 0x0

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

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

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

    field public static final int SET_OPPORTUNISTIC_SUB_SUCCESS = 0; // 0x0

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

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

telephony/java/android/telephony/SubscriptionManager.java

+3 −1
Original line number Diff line number Diff line
@@ -2596,7 +2596,9 @@ public class SubscriptionManager { 
     *              {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID}, it means

     *              it's unset and {@link SubscriptionManager#getDefaultDataSubscriptionId()}

     *              is used to determine which modem is preferred.

     * @param needValidation whether validation is needed before switch happens.

     * @param needValidation whether Telephony will wait until the network is validated by

     *              connectivity service before switching data to it. More details see

     *              {@link NetworkCapabilities#NET_CAPABILITY_VALIDATED}.

     * @param executor The executor of where the callback will execute.

     * @param callback Callback will be triggered once it succeeds or failed.

     *                 See {@link TelephonyManager.SetOpportunisticSubscriptionResult}

telephony/java/android/telephony/TelephonyManager.java

+3 −3
Original line number Diff line number Diff line
@@ -10351,7 +10351,7 @@ public class TelephonyManager { 
    @IntDef(prefix = {"SET_OPPORTUNISTIC_SUB"}, value = {

            SET_OPPORTUNISTIC_SUB_SUCCESS,

            SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED,

            SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER})

            SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION})

    public @interface SetOpportunisticSubscriptionResult {}



    /**
@@ -10365,9 +10365,9 @@ public class TelephonyManager { 
    public static final int SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED = 1;



    /**

     * The parameter passed in is invalid.

     * The subscription is not valid. It must be an active opportunistic subscription.

     */

    public static final int SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER = 2;

    public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)