Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd8df823 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d 

am: e2075c2c

Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
parents 9c6acbd2 e2075c2c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/CarrierConfigManager.java

+17 −1
Original line number Diff line number Diff line
@@ -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";