Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb

Browse Source 
am: 869f32d810

* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
  Per API review, revert the API renaming CL.

Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f
This commit is contained in:
Derek Tan
2016-05-26 00:00:49 +00:00
committed by android-build-merger
parent 7cd37f89ef 869f32d810
commit 9b8b72748c
4 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -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";

6
api/system-current.txt
View File

@@ -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";

6
api/test-current.txt
View File

@@ -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";

44
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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.
*
* <p>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 {
* <p>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.
* </p>
*
* @deprecated use notifyConfigChanged.
*/
public void notifyConfigChangedForSubId(int subId) {
notifyConfigChanged(subId);
}
/**
* Calling this method triggers telephony services to fetch the current carrier configuration.
* <p>
* 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.
* </p>
* <p>Requires that the calling app has carrier privileges.
* @see #hasCarrierPrivileges
* <p>
* This method returns before the reload has completed, and
* {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an
* arbitrary thread.
* </p>
*/
public void notifyConfigChanged(int subId) {
try {
ICarrierConfigLoader loader = getICarrierConfigLoader();
if (loader == null) {