From 8a4275f09f6478bf802d9b05d5a60454c0bdb41f Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Wed, 24 Jan 2018 12:54:44 -0800 Subject: [PATCH] Update comments for ACTION_CARRIER_CONFIG_CHANGED. Test: none Bug: 64131518 Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445 --- api/current.txt | 2 ++ .../telephony/CarrierConfigManager.java | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 7954bf5539871..33d3bb97c6b60 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39995,6 +39995,8 @@ package android.telephony { 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 int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe + field public static final java.lang.String EXTRA_SLOT_INDEX = "android.telephony.extra.SLOT_INDEX"; + field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; 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"; field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f59871b00c2aa..94ed21848073d 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -38,6 +38,19 @@ import com.android.internal.telephony.ICarrierConfigLoader; public class CarrierConfigManager { private final static String TAG = "CarrierConfigManager"; + /** + * Extra included in {@link #ACTION_CARRIER_CONFIG_CHANGED} to indicate the slot index that the + * broadcast is for. + */ + public static final String EXTRA_SLOT_INDEX = "android.telephony.extra.SLOT_INDEX"; + + /** + * Optional extra included in {@link #ACTION_CARRIER_CONFIG_CHANGED} to indicate the + * subscription index that the broadcast is for, if a valid one is available. + */ + public static final String EXTRA_SUBSCRIPTION_INDEX = + SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX; + /** * @hide */ @@ -45,7 +58,10 @@ public class CarrierConfigManager { } /** - * This intent is broadcast by the system when carrier config changes. + * This intent is broadcast by the system when carrier config changes. An int is specified in + * {@link #EXTRA_SLOT_INDEX} to indicate the slot index that this is for. An optional int extra + * {@link #EXTRA_SUBSCRIPTION_INDEX} is included to indicate the subscription index if a valid + * one is available for the slot index. */ public static final String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";