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

Browse Source 
am: 5bed401148

Change-Id: Ie7fc58959699716fc3bd25dfa67a9f1567452009
This commit is contained in:
fionaxu
2017-09-06 04:11:02 +00:00
committed by android-build-merger
parent f3bd8a9a3f 5bed401148
commit bd1a716135
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

@@ -1762,13 +1762,7 @@ public class CarrierConfigManager {
// Carrier Signalling Receivers // Carrier Signalling Receivers
sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, ""); sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, "");
sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY, sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);
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_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);