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

Commit ac9b2c4f authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Add UI prompt for MMI code failure on 3gpp"

parents 27ad0516 ade99374

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37436,6 +37436,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

    field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

    field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40606,6 +40606,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

    field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

    field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37518,6 +37518,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

    field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

    field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ 
    <!-- Displayed when the user dialed an MMI code whose function

         could not be performed because FDN is enabled. This will be displayed in a toast. -->

    <string name="mmiFdnError">Operation is restricted to fixed dialing numbers only.</string>

    <!-- Displayed when a carrier does not support call forwarding queries when roaming. -->

    <string name="mmiErrorWhileRoaming">Can not change call forwarding settings from your phone while you are roaming.</string>



    <!-- Displayed when a phone feature such as call barring was activated. -->

    <string name="serviceEnabled">Service was enabled.</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ 
  <java-symbol type="string" name="mmiComplete" />

  <java-symbol type="string" name="mmiError" />

  <java-symbol type="string" name="mmiFdnError" />

  <java-symbol type="string" name="mmiErrorWhileRoaming" />

  <java-symbol type="string" name="month_day_year" />

  <java-symbol type="string" name="more_item_label" />

  <java-symbol type="string" name="needPuk" />