summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-09-07 21:32:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-09-07 21:32:45 +0000
commitcfc78f936f6e41f88216de5da2d3f5d1100b5e4a (patch)
tree827d30094b990055d04247b5d1e1c903939cfaac
parent4b2df18bed5e641bb8a6bd3fde7fcdcdf09cd440 (diff)
parent382ec5fec83fe13d9f1d4b08432a78b47f9fea31 (diff)
Merge "Merge "disable carrier actions on redirection part 2" into oc-mr1-dev am: b6a1c5f06b am: 4de11ebc0f"
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 0572b498ca17..919fa98ba1e0 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1760,7 +1760,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);