From 5ea0c8f1c660630edcdd5abdac076f7df69a7f8a Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Mon, 8 Jun 2015 12:25:55 -0700 Subject: [PATCH] Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId Per discussion with API council, "notify" makes more sense than "reload" here. Bug: 21571894 Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5 --- api/current.txt | 2 +- api/system-current.txt | 2 +- core/java/android/service/carrier/CarrierService.java | 8 ++++---- .../java/android/telephony/CarrierConfigManager.java | 9 +++++---- .../android/internal/telephony/ICarrierConfigLoader.aidl | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/api/current.txt b/api/current.txt index 6b261d8506cf0..8680c4934de9f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/system-current.txt b/api/system-current.txt index 1c524c16926ac..44baba29ab570 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/core/java/android/service/carrier/CarrierService.java b/core/java/android/service/carrier/CarrierService.java index 4a4a37544a553..5f834520a9eed 100644 --- a/core/java/android/service/carrier/CarrierService.java +++ b/core/java/android/service/carrier/CarrierService.java @@ -59,16 +59,16 @@ public abstract class CarrierService extends Service { *
    *
  1. The carrier app package is updated, or
    2. *
  2. The carrier app requests a reload with - * {@link android.telephony.CarrierConfigManager#reloadCarrierConfigForSubId - * reloadCarrierConfigForSubId}.
    3. + * {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId + * notifyConfigChangedForSubId}. *
* This method can be called after a SIM card loads, which may be before or after boot. *

*

* 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. *

*

* Implementations should use the keys defined in {@link android.telephony.CarrierConfigManager diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index ccfaca762b330..b74b52d71a3c0 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -380,8 +380,9 @@ public class CarrierConfigManager { /** * 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. 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. *

*

* This method returns before the reload has completed, and @@ -389,9 +390,9 @@ public class CarrierConfigManager { * arbitrary thread. *

*/ - 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) { diff --git a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl index cb53f51d735b2..d77b27f8295ad 100644 --- a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +++ b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl @@ -25,7 +25,7 @@ interface ICarrierConfigLoader { PersistableBundle getConfigForSubId(int subId); - void reloadCarrierConfigForSubId(int subId); + void notifyConfigChangedForSubId(int subId); void updateConfigForPhoneId(int phoneId, String simState); }