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

Commit daa6bcdb authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

Merge "Add support for showing forwarded number in call screen."

parents ab3d16fe 5ee4589d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -46134,6 +46134,7 @@ package android.telephony { 
    field public static final String KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL = "show_call_blocking_disabled_notification_always_bool";

    field public static final String KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING = "show_carrier_data_icon_pattern_string";

    field public static final String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

    field public static final String KEY_SHOW_FORWARDED_NUMBER_BOOL = "show_forwarded_number_bool";

    field public static final String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

    field public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL = "show_ims_registration_status_bool";

    field public static final String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12728,6 +12728,7 @@ package android.telephony.ims { 
    field public static final String EXTRA_DIALSTRING = "dialstring";

    field public static final String EXTRA_DISPLAY_TEXT = "DisplayText";

    field public static final String EXTRA_EMERGENCY_CALL = "e_call";

    field public static final String EXTRA_FORWARDED_NUMBER = "android.telephony.ims.extra.FORWARDED_NUMBER";

    field public static final String EXTRA_IS_CALL_PULL = "CallPull";

    field public static final String EXTRA_OI = "oi";

    field public static final String EXTRA_OIR = "oir";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3577,6 +3577,7 @@ package android.telephony.ims { 
    field public static final String EXTRA_DIALSTRING = "dialstring";

    field public static final String EXTRA_DISPLAY_TEXT = "DisplayText";

    field public static final String EXTRA_EMERGENCY_CALL = "e_call";

    field public static final String EXTRA_FORWARDED_NUMBER = "android.telephony.ims.extra.FORWARDED_NUMBER";

    field public static final String EXTRA_IS_CALL_PULL = "CallPull";

    field public static final String EXTRA_OEM_EXTRAS = "android.telephony.ims.extra.OEM_EXTRAS";

    field public static final String EXTRA_OI = "oi";

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -3463,6 +3463,14 @@ public class CarrierConfigManager { 
    public static final String KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL =

            "prevent_clir_activation_and_deactivation_code_bool";



    /**

     * Flag specifying whether to show forwarded number on call-in-progress screen.

     * When true, forwarded number is shown.

     * When false, forwarded number is not shown.

     */

    public static final String KEY_SHOW_FORWARDED_NUMBER_BOOL =

            "show_forwarded_number_bool";



    /**

     * Configs used for epdg tunnel bring up.

     *
@@ -4320,6 +4328,7 @@ public class CarrierConfigManager { 
        // Default wifi configurations.

        sDefaults.putAll(Wifi.getDefaults());

        sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_FORWARDED_NUMBER_BOOL, false);

        sDefaults.putAll(Iwlan.getDefaults());

    }

telephony/java/android/telephony/ims/ImsCallProfile.java

+8 −0
Original line number Diff line number Diff line
@@ -328,6 +328,14 @@ public final class ImsCallProfile implements Parcelable { 
    @Deprecated

    public static final String EXTRA_CALL_RAT_TYPE_ALT = "callRadioTech";



    /**

     * String extra property containing forwarded numbers associated with the current connection

     * for an IMS call. The value is string array, and it can include multiple numbers, and

     * the array values are expected E164 (e.g. +1 (650) 253-0000) format.

     */

    public static final String EXTRA_FORWARDED_NUMBER =

            "android.telephony.ims.extra.FORWARDED_NUMBER";



    /** @hide */

    public int mServiceType;

    /** @hide */