disable carrier actions on redirection part 2
DO NOT MERGE handle the corner case: user on new pixel device update from O-DR to
O-MR when they are in captive portal scenario. In this scenrio,
we enabled captiveportalLoginActivity has the default url handler. this
will be persist and reset on sim absent/sim load/network avail.
On my previous fix, I removed all the signals which means after OTA
we won't reset this part. We should leave the reset signal to ensure
no carrier actions applied. even if something abnormal happens, we can
recover gracefully from reboot.
Bug: 65113738
Test: Manual
Change-Id: I445c7bce01e0bf36214f5f4f6327a0582c774dae
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 63d492a..c36b3ac 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1762,7 +1762,11 @@
// 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);