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

Commit fc73a77d authored by Thomas Stuart's avatar Thomas Stuart
Browse files

remove the busy tone value from the KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY 

The busy tone value should not be in the default disconnect cause array.
This can cause issues with the busy label as it can be overriden by
Telecom instead of the precise label passed by the lower layer

Bug: 296968778
Test: unit tests + manual
Change-Id: I10f72c6be279459bfd611fa1397149d122ec1d07
parent 61ac7704

telephony/java/android/telephony/CarrierConfigManager.java

+7 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.telephony.ims.feature.MmTelFeature; 
import android.telephony.ims.feature.RcsFeature;



import com.android.internal.telephony.ICarrierConfigLoader;

import com.android.internal.telephony.flags.Flags;

import com.android.telephony.Rlog;



import java.util.List;
@@ -10430,8 +10431,12 @@ public class CarrierConfigManager { 
        sDefaults.putAll(Iwlan.getDefaults());

        sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, new String[0]);

        sDefaults.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false);

        if (Flags.doNotOverridePreciseLabel()) {

            sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY, new int[]{});

        } else {

            sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,

                    new int[]{4 /* BUSY */});

        }

        sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);

        sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 5000);

        sDefaults.putStringArray(KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY, new String[0]);