From 204777011dd6b63b807c89fafe2fdba6f8eb7132 Mon Sep 17 00:00:00 2001 From: fionaxu Date: Tue, 5 Sep 2017 14:15:04 -0700 Subject: [PATCH] disable carrier actions on redirection by default 1. the assumption of "carrier will redirect users to their captive portal page when users dont have data plan" might not be true for all carriers. We have seem issues like carriers random redirect users when they still have balance left. 2. turn this off by default and turn it on if the carrier is behaving correctly and agree with it. Bug: 65113738 Test: Manual Change-Id: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e --- .../java/android/telephony/CarrierConfigManager.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 81353dfbd743b..6272c962b2fdc 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1747,13 +1747,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);