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

Commit 539c15ec authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by Android (Google) Code Review
Browse files

Merge "Show notification when VoWiFi is active, and user is out of service for... 

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

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -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);