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

Commit 4de11ebc authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "disable carrier actions on redirection part 2" into oc-mr1-dev 

am: b6a1c5f0

Change-Id: Ida67351bac953f7b1bc4eb3d0ebc8a331e55b9a1
parents f8554c07 b6a1c5f0

telephony/java/android/telephony/CarrierConfigManager.java

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


        // Carrier Signalling Receivers

        sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, "");

        sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,

                new String[]{

                        "com.android.carrierdefaultapp/.CarrierDefaultBroadcastReceiver:"

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

                });

        sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);