diff options
| author | 2022-10-18 08:48:17 +0000 | |
|---|---|---|
| committer | 2022-10-18 08:48:17 +0000 | |
| commit | 5582db8e557937b61b8cf534b51007a85f145253 (patch) | |
| tree | 1beb1f6146c2b2bd05ddab326693ad204834e82f | |
| parent | 75a803b955d907fa1bb59c06d44461df1faba925 (diff) | |
| parent | 87b5575356bd3ec171a84cd62fae40a09411aa9d (diff) | |
Merge "Deprecating SubscriptionManager#switchToSubscription API"
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 559f8f551a03..9c6dac27f0c9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index e6c6b62497a8..eb3affcd3322 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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); |