Merge "disable carrier actions on redirection by default" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-09-06 04:01:43 +00:00
committed by Android (Google) Code Review

View File

@@ -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);