Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in... (d94fbf85) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -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";

api/system-current.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -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";

telephony/java/android/telephony/CarrierConfigManager.java

+42 −2

Original line number	Diff line number	Diff line
		@@ -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,11 @@ 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());
		}

		/**
		@@ -727,8 +746,29 @@ 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 {
		getICarrierConfigLoader().notifyConfigChangedForSubId(subId);
		} catch (RemoteException ex) {