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

Commit 76118583 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix WFC location privacy carrier config" into qt-dev am: 1923b35e 

am: e4e5ec04

Change-Id: I6100098b849fd1453060a91d85c94ecea51d72cc
parents 084a600d e4e5ec04

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3312,7 +3312,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_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, false);

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);

        sDefaults.putString(KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING, "");

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,