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

Commit 64e868d3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rehide the API" into sc-dev am: 77501ebc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13612502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4cff15e927fbf77e13cc7e4250421696b2d8bcb
parents 7f26b602 77501ebc

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -40740,7 +40740,6 @@ package android.telephony { 
    field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

    field public static final String KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL = "store_sim_pin_for_unattended_reboot_bool";

    field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";

    field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4744,7 +4744,7 @@ public class CarrierConfigManager { 
    public static final String KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL =

            "network_temp_not_metered_supported_bool";



    /*

    /**

     * Boolean indicating whether the SIM PIN can be stored and verified

     * seamlessly after an unattended reboot.

     *