Loading api/current.txt +1 −1 Original line number Diff line number Diff line Loading @@ -30670,7 +30670,7 @@ package android.telephony { public class CarrierConfigManager { method public android.os.PersistableBundle getConfig(); method public android.os.PersistableBundle getConfigForSubId(int); method public void reloadCarrierConfigForSubId(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_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; api/system-current.txt +1 −1 Original line number Diff line number Diff line Loading @@ -32885,7 +32885,7 @@ package android.telephony { method public android.os.PersistableBundle getConfig(); method public android.os.PersistableBundle getConfigForSubId(int); method public static android.os.PersistableBundle getDefaultConfig(); method public void reloadCarrierConfigForSubId(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"; core/java/android/service/carrier/CarrierService.java +4 −4 Original line number Diff line number Diff line Loading @@ -59,16 +59,16 @@ public abstract class CarrierService extends Service { * <ol> * <li>The carrier app package is updated, or</li> * <li>The carrier app requests a reload with * {@link android.telephony.CarrierConfigManager#reloadCarrierConfigForSubId * reloadCarrierConfigForSubId}.</li> * {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId * notifyConfigChangedForSubId}.</li> * </ol> * This method can be called after a SIM card loads, which may be before or after boot. * </p> * <p> * This method should not block for a long time. If expensive operations (e.g. network access) * are required, this method can schedule the work and return null. Then, use * {@link android.telephony.CarrierConfigManager#reloadCarrierConfigForSubId * reloadCarrierConfigForSubId} to trigger a reload when the config is ready. * {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId * notifyConfigChangedForSubId} to trigger a reload when the config is ready. * </p> * <p> * Implementations should use the keys defined in {@link android.telephony.CarrierConfigManager Loading telephony/java/android/telephony/CarrierConfigManager.java +5 −4 Original line number Diff line number Diff line Loading @@ -380,8 +380,9 @@ public class CarrierConfigManager { /** * 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. Call * this method if your app wants to update config at an arbitrary moment. * 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> * This method returns before the reload has completed, and Loading @@ -389,9 +390,9 @@ public class CarrierConfigManager { * arbitrary thread. * </p> */ public void reloadCarrierConfigForSubId(int subId) { public void notifyConfigChangedForSubId(int subId) { try { getICarrierConfigLoader().reloadCarrierConfigForSubId(subId); getICarrierConfigLoader().notifyConfigChangedForSubId(subId); } catch (RemoteException ex) { Rlog.e(TAG, "Error reloading config for subId=" + subId + ": " + ex.toString()); } catch (NullPointerException ex) { Loading telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +1 −1 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ interface ICarrierConfigLoader { PersistableBundle getConfigForSubId(int subId); void reloadCarrierConfigForSubId(int subId); void notifyConfigChangedForSubId(int subId); void updateConfigForPhoneId(int phoneId, String simState); } Loading
api/current.txt +1 −1 Original line number Diff line number Diff line Loading @@ -30670,7 +30670,7 @@ package android.telephony { public class CarrierConfigManager { method public android.os.PersistableBundle getConfig(); method public android.os.PersistableBundle getConfigForSubId(int); method public void reloadCarrierConfigForSubId(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_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
api/system-current.txt +1 −1 Original line number Diff line number Diff line Loading @@ -32885,7 +32885,7 @@ package android.telephony { method public android.os.PersistableBundle getConfig(); method public android.os.PersistableBundle getConfigForSubId(int); method public static android.os.PersistableBundle getDefaultConfig(); method public void reloadCarrierConfigForSubId(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";
core/java/android/service/carrier/CarrierService.java +4 −4 Original line number Diff line number Diff line Loading @@ -59,16 +59,16 @@ public abstract class CarrierService extends Service { * <ol> * <li>The carrier app package is updated, or</li> * <li>The carrier app requests a reload with * {@link android.telephony.CarrierConfigManager#reloadCarrierConfigForSubId * reloadCarrierConfigForSubId}.</li> * {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId * notifyConfigChangedForSubId}.</li> * </ol> * This method can be called after a SIM card loads, which may be before or after boot. * </p> * <p> * This method should not block for a long time. If expensive operations (e.g. network access) * are required, this method can schedule the work and return null. Then, use * {@link android.telephony.CarrierConfigManager#reloadCarrierConfigForSubId * reloadCarrierConfigForSubId} to trigger a reload when the config is ready. * {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId * notifyConfigChangedForSubId} to trigger a reload when the config is ready. * </p> * <p> * Implementations should use the keys defined in {@link android.telephony.CarrierConfigManager Loading
telephony/java/android/telephony/CarrierConfigManager.java +5 −4 Original line number Diff line number Diff line Loading @@ -380,8 +380,9 @@ public class CarrierConfigManager { /** * 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. Call * this method if your app wants to update config at an arbitrary moment. * 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> * This method returns before the reload has completed, and Loading @@ -389,9 +390,9 @@ public class CarrierConfigManager { * arbitrary thread. * </p> */ public void reloadCarrierConfigForSubId(int subId) { public void notifyConfigChangedForSubId(int subId) { try { getICarrierConfigLoader().reloadCarrierConfigForSubId(subId); getICarrierConfigLoader().notifyConfigChangedForSubId(subId); } catch (RemoteException ex) { Rlog.e(TAG, "Error reloading config for subId=" + subId + ": " + ex.toString()); } catch (NullPointerException ex) { Loading
telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +1 −1 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ interface ICarrierConfigLoader { PersistableBundle getConfigForSubId(int subId); void reloadCarrierConfigForSubId(int subId); void notifyConfigChangedForSubId(int subId); void updateConfigForPhoneId(int phoneId, String simState); }