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

Commit 87b55753 authored by sandeepjs's avatar sandeepjs
Browse files

Deprecating SubscriptionManager#switchToSubscription API 

This API is a duplicate of EuiccManager#switchToSubscription and
does not support Multiple Enabled Profile(MEP). Apps should use EuiccManager#switchToSubscription instead.

Test: make
Bug: 226388098
Change-Id: I6533370e0ef069bb5c4363ebbcb72ca200029193
parent 35048ac0

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43368,7 +43368,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
@@ -3249,12 +3249,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);