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

resolve merge conflicts of 6df58d8da1 to oc-dr1-dev

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
This commit is contained in:
fionaxu
2017-09-15 13:52:04 -07:00
committed by Chen Xu
parent 91fb9b2a16 6df58d8da1
commit 6e40562a73
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1704,10 +1704,8 @@ public class CarrierConfigManager {
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"
"com.android.carrierdefaultapp/.CarrierDefaultBroadcastReceiver:" +
"com.android.internal.telephony.CARRIER_SIGNAL_RESET"
});
sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);