diff options
| author | fionaxu <fionaxu@google.com> | 2017-09-06 22:57:32 -0700 |
|---|---|---|
| committer | Chen Xu <fionaxu@google.com> | 2017-09-07 07:01:12 +0000 |
| commit | 619e5c8ecc4e217cd92a7c9692116d0017ddadca (patch) | |
| tree | 912d51124e5e606ef87e9951d1664f996b6531d6 | |
| parent | a15992086c63c38cb61ed23af8c5507d413c4776 (diff) | |
| parent | 6c7ef2e8d7538e8d9b38e724cffd5cf81c7dad10 (diff) | |
resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 855d19cafa73..0392be7db2db 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1736,10 +1736,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); |