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

Commit 555090d5 authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" 

am: 94fe6430

Change-Id: Ic9087bd5f12bdcf184d49b9590bd601da7bfb0ea
parents 3cde670d 94fe6430

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -42001,7 +42001,6 @@ package android.telephony { 
    field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final java.lang.String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

    field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final java.lang.String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL = "support_clir_network_default_bool";

    field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

    field public static final java.lang.String KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";

    field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+0 −8
Original line number Diff line number Diff line
@@ -2232,13 +2232,6 @@ public class CarrierConfigManager { 
    public static final String KEY_CALL_WAITING_OVER_UT_WARNING_BOOL =

            "call_waiting_over_ut_warning_bool";



    /**

     * Flag indicating whether to support "Network default" option in Caller ID settings for Calling

     * Line Identification Restriction (CLIR).

     */

    public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL =

            "support_clir_network_default_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -2587,7 +2580,6 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CALL_BARRING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALLER_ID_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_WAITING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL, true);

    }



    /**