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

Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev

Browse Source
This commit is contained in:
Shishir Agrawal
2016-02-24 17:33:11 +00:00
committed by Android Partner Code Review
parent 51e4acb29d 658d3c8b3a
commit d94fbf85d6
3 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -30576,9 +30576,11 @@ package android.telecom {
package android.telephony {
public class CarrierConfigManager {
method public android.os.PersistableBundle getConfig(int);
method public android.os.PersistableBundle getConfig();
method public android.os.PersistableBundle getConfigForSubId(int);
method public void notifyConfigChangedForSubId(int);
method public deprecated android.os.PersistableBundle getConfigForSubId(int);
method public void notifyConfigChanged(int);
method public deprecated 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_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";

6
api/system-current.txt
View File

@@ -32849,10 +32849,12 @@ package android.telecom {
package android.telephony {
public class CarrierConfigManager {
method public android.os.PersistableBundle getConfig(int);
method public android.os.PersistableBundle getConfig();
method public android.os.PersistableBundle getConfigForSubId(int);
method public deprecated android.os.PersistableBundle getConfigForSubId(int);
method public static android.os.PersistableBundle getDefaultConfig();
method public void notifyConfigChangedForSubId(int);
method public void notifyConfigChanged(int);
method public deprecated 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 BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";

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

@@ -685,9 +685,28 @@ 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 {
return getICarrierConfigLoader().getConfigForSubId(subId);
} catch (RemoteException ex) {
@@ -706,11 +725,32 @@ public class CarrierConfigManager {
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*
* @see #getConfigForSubId
* @return A {@link PersistableBundle} containing the config for the default subscription.
*/
@Nullable
public PersistableBundle getConfig() {
return getConfigForSubId(SubscriptionManager.getDefaultSubscriptionId());
return getConfig(SubscriptionManager.getDefaultSubscriptionId());
}
/**
* 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>
*
* @deprecated use notifyConfigChanged.
*/
public void notifyConfigChangedForSubId(int subId) {
notifyConfigChanged(subId);
}
/**
@@ -728,7 +768,7 @@ public class CarrierConfigManager {
* arbitrary thread.
* </p>
*/
public void notifyConfigChangedForSubId(int subId) {
public void notifyConfigChanged(int subId) {
try {
getICarrierConfigLoader().notifyConfigChangedForSubId(subId);
} catch (RemoteException ex) {