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

Commit 721df801 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Add a new carrier config to show the WFC location privacy policy UI"

parents 02f144a8 7f3a9d08

telephony/java/android/telephony/CarrierConfigManager.java

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

            "cdma_enhanced_roaming_indicator_for_home_network_int_array";



    /**

     * Determines whether wifi calling location privacy policy is shown.

     *

     * @hide

     */

    public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL =

            "show_wfc_location_privacy_policy_bool";



    /**

     * Indicates use 3GPP application to replace 3GPP2 application even if it's a CDMA/CDMA-LTE

     * phone, becasue some carriers's CSIM application is present but not supported.
@@ -3111,6 +3119,7 @@ public class CarrierConfigManager { 
                });

        sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);

        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, true);

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,

                false);