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

Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev

Browse Source
This commit is contained in:
Pankaj Kanwar
2017-08-16 01:11:35 +00:00
committed by Android (Google) Code Review
parent 4b7b5a6c59 68e3de7214
commit 539c15ec84
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1362,6 +1362,16 @@ public class CarrierConfigManager {
public static final String KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT =
"network_notification_delay_int";
/**
* Time delay (in ms) after which we show the notification for emergency calls,
* while the device is registered over WFC. Default value is -1, which indicates
* that this notification is not pertinent for a particular carrier. We've added a delay
* to prevent false positives.
* @hide
*/
public static final String KEY_EMERGENCY_NOTIFICATION_DELAY_INT =
"emergency_notification_delay_int";
/**
* When {@code true}, the carrier allows the user of the
* {@link TelephonyManager#sendUssdRequest(String, TelephonyManager.UssdResponseCallback,
@@ -1788,6 +1798,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.putInt(KEY_EMERGENCY_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);