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

Commit 6f873319 authored by Joe LaPenna's avatar Joe LaPenna Committed by android-build-merger
Browse files

Merge "Add simplified_network_settings_bool to CarrierConfig." 

am: 4ce798f4

Change-Id: I7343422cd3405628d6c2b90092af631b77eb37a7
parents b6022b9f 4ce798f4

api/current.txt

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

    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    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_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

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

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -25757,8 +25757,8 @@ package android.net { 
  }















  public final class RecommendationResult implements android.os.Parcelable {













    method public static android.net.RecommendationResult createDoNotConnectRecommendation();















    method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration);













    method public static android.net.RecommendationResult createDoNotConnectRecommendation();















    method public int describeContents();















    method public android.net.wifi.WifiConfiguration getWifiConfiguration();















    method public boolean hasRecommendation();










@@ -40061,6 +40061,7 @@ package android.telephony {













    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";















    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";















    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";













    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";















    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_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";















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

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -37010,6 +37010,7 @@ package android.telephony {













    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";















    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";















    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";













    field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";















    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_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_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
−1




























Original line number
Diff line number
Diff line








@@ -146,7 +146,6 @@ public class CarrierConfigManager {













    /**















     * Control whether users receive a simplified network settings UI and improved network















     * selection.













     * @hide















     */















    public static final String















            KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";