From 5e0164e16c0b7fd5bf104bb6648f954910a9ef7d Mon Sep 17 00:00:00 2001 From: Joe LaPenna Date: Wed, 21 Dec 2016 20:17:08 -0800 Subject: [PATCH] Add simplified_network_settings_bool to CarrierConfig. Some carriers want to further simplify network settings based on a variety of wifi or cellular related bundles. Expose a config a carrier might set to allow SysUi, Settings and platform to adjust. BUG: 33111931 Test: runtest carrierconfig-unit Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804 Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804 --- api/current.txt | 1 + api/system-current.txt | 3 ++- api/test-current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 20cc23161f185..86b2119aed9ee 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36932,6 +36932,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"; diff --git a/api/system-current.txt b/api/system-current.txt index f25840dd3aa5f..b2f2a3ca43dab 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25761,8 +25761,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(); @@ -40065,6 +40065,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 03499399d30f7..e3a395be4acbd 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -37014,6 +37014,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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 051f1bd67f90b..2c16ca0827470 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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";