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

Commit 72184732 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Add UI prompt for MMI code failure on 3gpp 

am: ac8d8e73

Change-Id: Id83a2fa2dd958a0fbfcb2d5eb90528bcf96737b8
parents 3d6a77af ac8d8e73

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
@@ -726,6 +726,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" />

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,15 @@ public class CarrierConfigManager { 
    public static final String KEY_EDITABLE_TETHER_APN_BOOL =

            "editable_tether_apn_bool";



    /**

     * Indicates whether the carrier supports 3gpp call forwarding MMI codes while roaming. If

     * false, the user will be notified that call forwarding is not available when the MMI code

     * fails.

     * @hide

     */

    public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL =

        "support_3gpp_call_forwarding_while_roaming_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -1305,6 +1314,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);

    }



    /**