summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfionaxu <fionaxu@google.com>2017-09-06 14:19:16 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-21 23:22:02 +0000
commit8ab02e6d2c7d419c226588fae164f9cb442e170e (patch)
tree039791d8bb09ba603af371a3715695215944be29
parent3982f8ab4c6549596b0eaa7fa2c5b770cd3671f7 (diff)
downloadbase-8ab02e6d2c7d419c226588fae164f9cb442e170e.tar.gz
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. Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae Bug: 65113738 Test: Manual Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3 (cherry picked from commit 1aedcdd075cf770332e1d45dc4cf0cbbe130e6da)
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index d199f0790b79..d1eb3db54525 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1614,7 +1614,6 @@ public class CarrierConfigManager {
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"
});
sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);