diff options
| author | fionaxu <fionaxu@google.com> | 2017-09-15 13:52:04 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-22 23:04:51 +0000 |
| commit | 529dfa71c934d9bf727d531c5016dce1c12d7c43 (patch) | |
| tree | 8139cc35af4cb92f36d86294b197963039e77ba1 | |
| parent | 93db886071884969af0a39ac9daf9458e355bd23 (diff) | |
| download | base-529dfa71c934d9bf727d531c5016dce1c12d7c43.tar.gz | |
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
(cherry picked from commit 6e40562a7388a33372b6244462aa86aabaa966c2)
| -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 bbda1c6194df..11f99cfe24ca 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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); |