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

Commit e41da410 authored by Thomas Stuart's avatar Thomas Stuart Committed by Android (Google) Code Review
Browse files

Merge "cleanup flag doNotOverridePreciseLabels" into main

parents aa58dba1 2f3ed8af

telephony/java/android/telephony/CarrierConfigManager.java

+1 −6
Original line number Diff line number Diff line
@@ -11340,12 +11340,7 @@ 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]);