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

Commit bcb1addc authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Expose key to override the SIM country ISO"

parents 558e2cf1 c2fd3d00

core/api/current.txt

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

    field public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL = "show_wfc_location_privacy_policy_bool";

    field @Deprecated public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final String KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING = "sim_country_iso_override_string";

    field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final String KEY_SMDP_SERVER_ADDRESS_STRING = "smdp_server_address_string";

    field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+0 −2
Original line number Diff line number Diff line
@@ -1796,8 +1796,6 @@ public class CarrierConfigManager { 
     * Instead, each sim carrier should have a single country code, apply per carrier based iso

     * code as an override. The overridden value can be read from

     * {@link TelephonyManager#getSimCountryIso()} and {@link SubscriptionInfo#getCountryIso()}

     *

     * @hide

     */

    public static final String KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING =

            "sim_country_iso_override_string";