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

Commit 08ab8031 authored by Gwen Lin's avatar Gwen Lin Committed by Automerger Merge Worker
Browse files

Merge "Add KEY_CARRIER_USSD_METHOD_INT to specify methods for USSD requests"... 

Merge "Add KEY_CARRIER_USSD_METHOD_INT to specify methods for USSD requests" am: 3acec4d1 am: ac3167e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372476

Change-Id: I8bfe72f4b2fd496303bacfee9d775ec3636d0dde
parents c9d29066 ac3167e3

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -46695,6 +46695,7 @@ package android.telephony { 
    field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";

    field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";

    field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";

    field public static final String KEY_CARRIER_USSD_METHOD_INT = "carrier_ussd_method_int";

    field public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";

    field public static final String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";

    field public static final String KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL = "carrier_volte_override_wfc_provisioning_bool";
@@ -46889,6 +46890,10 @@ package android.telephony { 
    field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";

    field public static final int SERVICE_CLASS_NONE = 0; // 0x0

    field public static final int SERVICE_CLASS_VOICE = 1; // 0x1

    field public static final int USSD_OVER_CS_ONLY = 2; // 0x2

    field public static final int USSD_OVER_CS_PREFERRED = 0; // 0x0

    field public static final int USSD_OVER_IMS_ONLY = 3; // 0x3

    field public static final int USSD_OVER_IMS_PREFERRED = 1; // 0x1

  }















  public static final class CarrierConfigManager.Apn {

























core/api/current.txt



+5
−0




























Original line number
Diff line number
Diff line








@@ -44863,6 +44863,7 @@ package android.telephony {













    field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";















    field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";















    field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";













    field public static final String KEY_CARRIER_USSD_METHOD_INT = "carrier_ussd_method_int";















    field public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";















    field public static final String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";















    field public static final String KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL = "carrier_volte_override_wfc_provisioning_bool";










@@ -45057,6 +45058,10 @@ package android.telephony {













    field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";















    field public static final int SERVICE_CLASS_NONE = 0; // 0x0















    field public static final int SERVICE_CLASS_VOICE = 1; // 0x1













    field public static final int USSD_OVER_CS_ONLY = 2; // 0x2













    field public static final int USSD_OVER_CS_PREFERRED = 0; // 0x0













    field public static final int USSD_OVER_IMS_ONLY = 3; // 0x3













    field public static final int USSD_OVER_IMS_PREFERRED = 1; // 0x1















  }





























  public static final class CarrierConfigManager.Apn {

























telephony/java/android/telephony/CarrierConfigManager.java



+39
−0




























Original line number
Diff line number
Diff line








@@ -79,6 +79,30 @@ public class CarrierConfigManager {













     */















    public static final int SERVICE_CLASS_VOICE = ImsSsData.SERVICE_CLASS_VOICE;





























    /**













     * Only send USSD over IMS while CS is out of service, otherwise send USSD over CS.













     * {@link #KEY_CARRIER_USSD_METHOD_INT}













     */













    public static final int USSD_OVER_CS_PREFERRED   = 0;



























    /**













     * Send USSD over IMS or CS while IMS is out of service or silent redial over CS if needed.













     * {@link #KEY_CARRIER_USSD_METHOD_INT}













     */













    public static final int USSD_OVER_IMS_PREFERRED  = 1;



























    /**













     * Only send USSD over CS.













     * {@link #KEY_CARRIER_USSD_METHOD_INT}













     */













    public static final int USSD_OVER_CS_ONLY        = 2;



























    /**













     * Only send USSD over IMS and disallow silent redial over CS.













     * {@link #KEY_CARRIER_USSD_METHOD_INT}













     */













    public static final int USSD_OVER_IMS_ONLY       = 3;





























    private final Context mContext;































    /**










@@ -583,6 +607,20 @@ public class CarrierConfigManager {













     */















    public static final String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";





























    /**













     * Specify the method of selection for UE sending USSD requests. The default value is













     * {@link #USSD_OVER_CS_PREFERRED}.













     * <p> Available options:













     * <ul>













     *   <li>0: {@link #USSD_OVER_CS_PREFERRED} </li>













     *   <li>1: {@link #USSD_OVER_IMS_PREFERRED} </li>













     *   <li>2: {@link #USSD_OVER_CS_ONLY} </li>













     *   <li>3: {@link #USSD_OVER_IMS_ONLY} </li>













     * </ul>













     */













    public static final String KEY_CARRIER_USSD_METHOD_INT =













            "carrier_ussd_method_int";





























    /**















     * Flag specifying whether to show an alert dialog for 5G disable when the user disables VoLTE.















     * By default this value is {@code false}.










@@ -3969,6 +4007,7 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);















        sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false);















        sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false);













        sDefaults.putInt(KEY_CARRIER_USSD_METHOD_INT, USSD_OVER_CS_PREFERRED);















        sDefaults.putBoolean(KEY_VOLTE_5G_LIMITED_ALERT_DIALOG_BOOL, false);















        sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);















        sDefaults.putBoolean(KEY_ALLOW_MERGING_RTT_CALLS_BOOL, false);