commit 387ce2fb811ca8c7afa7c1cb6e8bf791cb2fe85e
author Tyler Gunn <tgunn@google.com> Fri Aug 28 14:14:11 2015 -0700
committer Tyler Gunn <tgunn@google.com> Mon Aug 31 17:46:54 2015 +0000
tree 0c13b40e73f5136f1ca56e0e93c5c15ad4cc289c
parent 144c4ff08a0be40e6b8af1bca269b33557923d71

Add carrier config for allowing non-emerg calls in ECM mode.

Default value is TRUE for all carriers, meaning that non-emergency calls
are allowed even when the phone is in emergency callback mode.

Bug: 23063217
Change-Id: I4a227ce64a1e594a055560f42c7611c8eccdae0f

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 6a0bf64..62e532e 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -404,6 +404,15 @@
     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 @@
         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);
     }
 
     /**