diff --git a/api/current.txt b/api/current.txt index f33d613c2866e..b9bc92c3fae6e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36751,11 +36751,9 @@ package android.telecom { package android.telephony { public class CarrierConfigManager { - method public android.os.PersistableBundle getConfig(int); method public android.os.PersistableBundle getConfig(); - method public deprecated android.os.PersistableBundle getConfigForSubId(int); - method public void notifyConfigChanged(int); - method public deprecated void notifyConfigChangedForSubId(int); + method public android.os.PersistableBundle getConfigForSubId(int); + method public void notifyConfigChangedForSubId(int); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; diff --git a/api/system-current.txt b/api/system-current.txt index a84408202597f..fded1a7694325 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -39682,12 +39682,10 @@ package android.telecom { package android.telephony { public class CarrierConfigManager { - method public android.os.PersistableBundle getConfig(int); method public android.os.PersistableBundle getConfig(); - method public deprecated android.os.PersistableBundle getConfigForSubId(int); + method public android.os.PersistableBundle getConfigForSubId(int); method public static android.os.PersistableBundle getDefaultConfig(); - method public void notifyConfigChanged(int); - method public deprecated void notifyConfigChangedForSubId(int); + method public void notifyConfigChangedForSubId(int); method public void updateConfigForPhoneId(int, java.lang.String); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; diff --git a/api/test-current.txt b/api/test-current.txt index 60a2bff0af80e..4a56d0a9678e0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36829,11 +36829,9 @@ package android.telecom { package android.telephony { public class CarrierConfigManager { - method public android.os.PersistableBundle getConfig(int); method public android.os.PersistableBundle getConfig(); - method public deprecated android.os.PersistableBundle getConfigForSubId(int); - method public void notifyConfigChanged(int); - method public deprecated void notifyConfigChangedForSubId(int); + method public android.os.PersistableBundle getConfigForSubId(int); + method public void notifyConfigChangedForSubId(int); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b7701c6321804..22e2882cdf778 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -865,28 +865,9 @@ public class CarrierConfigManager { * @param subId the subscription ID, normally obtained from {@link SubscriptionManager}. * @return A {@link PersistableBundle} containing the config for the given subId, or default * values for an invalid subId. - * - * @deprecated use getConfig. */ @Nullable public PersistableBundle getConfigForSubId(int subId) { - return getConfig(subId); - } - - /** - * Gets the configuration values for a particular subscription, which is associated with a - * specific SIM card. If an invalid subId is used, the returned config will contain default - * values. - * - *

Requires Permission: - * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} - * - * @param subId the subscription ID, normally obtained from {@link SubscriptionManager}. - * @return A {@link PersistableBundle} containing the config for the given subId, or default - * values for an invalid subId. - */ - @Nullable - public PersistableBundle getConfig(int subId) { try { ICarrierConfigLoader loader = getICarrierConfigLoader(); if (loader == null) { @@ -908,11 +889,11 @@ public class CarrierConfigManager { *

Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * - * @return A {@link PersistableBundle} containing the config for the default subscription. + * @see #getConfigForSubId */ @Nullable public PersistableBundle getConfig() { - return getConfig(SubscriptionManager.getDefaultSubscriptionId()); + return getConfigForSubId(SubscriptionManager.getDefaultSubscriptionId()); } /** @@ -929,29 +910,8 @@ public class CarrierConfigManager { * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an * arbitrary thread. *

- * - * @deprecated use notifyConfigChanged. */ public void notifyConfigChangedForSubId(int subId) { - notifyConfigChanged(subId); - } - - /** - * Calling this method triggers telephony services to fetch the current carrier configuration. - *

- * Normally this does not need to be called because the platform reloads config on its own. - * This should be called by a carrier service app if it wants to update config at an arbitrary - * moment. - *

- *

Requires that the calling app has carrier privileges. - * @see #hasCarrierPrivileges - *

- * This method returns before the reload has completed, and - * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an - * arbitrary thread. - *

- */ - public void notifyConfigChanged(int subId) { try { ICarrierConfigLoader loader = getICarrierConfigLoader(); if (loader == null) {