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

Commit 5582db8e authored by Sandeep Jawalkar's avatar Sandeep Jawalkar Committed by Android (Google) Code Review
Browse files

Merge "Deprecating SubscriptionManager#switchToSubscription API"

parents 75a803b9 87b55753

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43552,7 +43552,7 @@ package android.telephony { 
    method public void setSubscriptionOverrideUnmetered(int, boolean, @NonNull int[], long);

    method @Deprecated public void setSubscriptionPlans(int, @NonNull java.util.List<android.telephony.SubscriptionPlan>);

    method public void setSubscriptionPlans(int, @NonNull java.util.List<android.telephony.SubscriptionPlan>, long);

    method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, @NonNull android.app.PendingIntent);

    method @Deprecated @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, @NonNull android.app.PendingIntent);

    field public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";

    field public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";

    field public static final String ACTION_MANAGE_SUBSCRIPTION_PLANS = "android.telephony.action.MANAGE_SUBSCRIPTION_PLANS";

telephony/java/android/telephony/SubscriptionManager.java

+2 −1
Original line number Diff line number Diff line
@@ -3196,12 +3196,13 @@ public class SubscriptionManager { 
     *  @param subId sub id

     *  @param callbackIntent pending intent that will be sent after operation is done.

     *

     *  to-be-deprecated this API is a duplicate of {@link EuiccManager#switchToSubscription(int,

     *  @deprecated this API is a duplicate of {@link EuiccManager#switchToSubscription(int,

     *  PendingIntent)} and does not support Multiple Enabled Profile(MEP). Apps should use

     *  {@link EuiccManager#switchToSubscription(int, PendingIntent)} or

     *  {@link EuiccManager#switchToSubscription(int, int, PendingIntent)} instead.

     */

    @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)

    @Deprecated

    public void switchToSubscription(int subId, @NonNull PendingIntent callbackIntent) {

        Preconditions.checkNotNull(callbackIntent, "callbackIntent cannot be null");

        EuiccManager euiccManager = new EuiccManager(mContext);