Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 619e5c8e authored by fionaxu's avatar fionaxu Committed by Chen Xu
Browse files

resolve merge conflicts of 6c7ef2e8 to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205
parents a1599208 6c7ef2e8

telephony/java/android/telephony/CarrierConfigManager.java

+2 −4
Original line number Diff line number Diff line
@@ -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);