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

Commit 31657c49 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Display no data notification in certain scenarios" am: 39e56169 am: 6d858e4d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660341

Change-Id: Icd2c42decc94c59189509e3f87115cf847b3a083
parents fe8e0b23 6d858e4d

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -4351,6 +4351,15 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";



    /**

     * Determine whether or not to display no data notification when data setup is permanently

     * failed.

     *

     * @hide

     */

    public static final String KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL =

            "display_no_data_notification_on_permanent_failure_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -4916,6 +4925,7 @@ public class CarrierConfigManager { 
                new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});

        sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true);

        sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false);

        sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false);

    }



    /**