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

Commit 3bd58233 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev 

* commit 'd833cb54':
  Add carrier config for allowing non-emerg calls in ECM mode.
parents 69e17f59 d833cb54

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -404,6 +404,15 @@ public class CarrierConfigManager { 
    public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";

    public static final String KEY_MMS_USER_AGENT_STRING = "userAgent";



    /**

     * Determines whether the carrier supports making non-emergency phone calls while the phone is

     * in emergency callback mode.  Default value is {@code true}, meaning that non-emergency calls

     * are allowed in emergency callback mode.

     * @hide

     */

    public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL =

            "allowNonEmergencyCallsInEcm";



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

    private final static PersistableBundle sDefaults;
@@ -496,6 +505,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_MMS_UA_PROF_TAG_NAME_STRING, "x-wap-profile");

        sDefaults.putString(KEY_MMS_UA_PROF_URL_STRING, "");

        sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");

        sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);

    }



    /**