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

Commit bd1a7161 authored by fionaxu's avatar fionaxu Committed by android-build-merger
Browse files

Merge "disable carrier actions on redirection by default" into oc-mr1-dev 

am: 5bed4011

Change-Id: Ie7fc58959699716fc3bd25dfa67a9f1567452009
parents f3bd8a9a 5bed4011

telephony/java/android/telephony/CarrierConfigManager.java

+1 −7
Original line number Diff line number Diff line
@@ -1762,13 +1762,7 @@ public class CarrierConfigManager { 


        // Carrier Signalling Receivers

        sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, "");

        sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,

                new String[]{

                        "com.android.carrierdefaultapp/.CarrierDefaultBroadcastReceiver:"

                                + "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED,"

                                + "com.android.internal.telephony.CARRIER_SIGNAL_RESET,"

                                + "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE"

                });

        sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);