diff options
| author | 2017-09-06 04:01:43 +0000 | |
|---|---|---|
| committer | 2017-09-06 04:01:43 +0000 | |
| commit | 5bed401148fdb4b04690cbca481e239e64176d5c (patch) | |
| tree | fc8c61f079676e1d79a5d25284a81b71119587d1 | |
| parent | f94e7b2c8b08bcbceb2082cf8b2fb7997344f353 (diff) | |
| parent | 204777011dd6b63b807c89fafe2fdba6f8eb7132 (diff) | |
Merge "disable carrier actions on redirection by default" into oc-mr1-dev
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 0f6a968902a2..63d492a53c5b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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); |