Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev

Browse Source 
am: 980582e555

Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906
This commit is contained in:
Tyler Gunn
2017-06-08 20:26:55 +00:00
committed by android-build-merger
parent 44442c4c99 980582e555
commit f512d86f5b
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1321,6 +1321,15 @@ public class CarrierConfigManager {
public static final String KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT = public static final String KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT =
"network_notification_delay_int"; "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 * 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 * false, the user will be notified that call forwarding is not available when the MMI code
@@ -1701,6 +1710,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, false); sDefaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, false);
sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);
sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1); 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_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);
sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false);
sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false); sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false);