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

Commit 10aa1fbb authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Add carrier config for data roaming notification" into qt-r1-dev am: 1482be4c 

am: 206e1aea

Change-Id: I64deeab5a7b7390da43116344d87064f3b455c8b
parents bcb9bd9e 206e1aea

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -2414,6 +2414,14 @@ public class CarrierConfigManager { 
    public static final String KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL =

            "check_pricing_with_carrier_data_roaming_bool";



     /**

      * Determines whether we should show a notification when the phone established a data

      * connection in roaming network, to warn users about possible roaming charges.

      * @hide

      */

    public static final String KEY_SHOW_DATA_CONNECTED_ROAMING_NOTIFICATION_BOOL =

            "show_data_connected_roaming_notification";



    /**

     * A list of 4 LTE RSRP thresholds above which a signal level is considered POOR,

     * MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting.
@@ -3433,6 +3441,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING, "");

        sDefaults.putBoolean(KEY_CARRIER_CONFIG_APPLIED_BOOL, false);

        sDefaults.putBoolean(KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_DATA_CONNECTED_ROAMING_NOTIFICATION_BOOL, false);

        sDefaults.putIntArray(KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY,

                new int[] {

                        -128, /* SIGNAL_STRENGTH_POOR */