Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disable carrier actions on redirection by default" into oc-mr1-dev am: 5bed401148

Browse Source 
am: bd1a716135

Change-Id: I6e0ef66e1cd96683b37f8eff0a8f6fbd4d2901f7
This commit is contained in:
fionaxu
2017-09-06 04:19:45 +00:00
committed by android-build-merger
parent 162790c257 bd1a716135
commit 1af24abbb9
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1760,13 +1760,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);