diff options
| author | 2017-06-08 20:06:52 +0000 | |
|---|---|---|
| committer | 2017-06-08 20:06:59 +0000 | |
| commit | 980582e555ec5acdf5b0c5905b0ff57d966027a9 (patch) | |
| tree | a5c09e47ec984ede133bdbf0a710f37365a12a8e | |
| parent | ebb6e998d5a4567095bca3608a2aa5afdf0d23de (diff) | |
| parent | 02212db446bfcc622f843f386fcf43b750e796e9 (diff) | |
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c6c1be3b23c3..d199f0790b79 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1292,6 +1292,15 @@ public class CarrierConfigManager { "network_notification_delay_int"; /** + * When {@code true}, the carrier allows the user of the + * {@link TelephonyManager#sendUssdRequest(String, TelephonyManager.UssdResponseCallback, + * Handler)} API to perform USSD requests. {@code True} by default. + * @hide + */ + public static final String KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL = + "allow_ussd_requests_via_telephony_manager_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. @@ -1648,6 +1657,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, false); sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null); sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1); + sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true); sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false); sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false); |