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

Commit f2cf09c9 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Adding validate before switch feature."

parents ae941732 d78dac0b

telephony/java/android/telephony/SubscriptionManager.java

+8 −2
Original line number Diff line number Diff line
@@ -2583,8 +2583,14 @@ public class SubscriptionManager { 
    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void setPreferredDataSubscriptionId(int subId) {

        if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);

        setSubscriptionPropertyHelper(DEFAULT_SUBSCRIPTION_ID, "setPreferredDataSubscriptionId",

                (iSub)-> iSub.setPreferredDataSubscriptionId(subId));

        try {

            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));

            if (iSub != null) {

                iSub.setPreferredDataSubscriptionId(subId);

            }

        } catch (RemoteException ex) {

            // ignore it

        }

    }



    /**

telephony/java/com/android/internal/telephony/ISub.aidl

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ interface ISub { 
     * @hide

     *

     */

    int setPreferredDataSubscriptionId(int subId);

    void setPreferredDataSubscriptionId(int subId);



    /**

     * Get which subscription is preferred for cellular data.