diff --git a/res/values/strings.xml b/res/values/strings.xml index 54dea727f28..2b4f809c183 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13375,8 +13375,6 @@ No SIM Network preferences - - Connect to public networks network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml index 9e8befa4cb1..9cab9241534 100644 --- a/res/xml/network_provider_settings.xml +++ b/res/xml/network_provider_settings.xml @@ -70,7 +70,6 @@ diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 12d2f5231d1..88211ad17ed 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -966,12 +966,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment @VisibleForTesting void setAdditionalSettingsSummaries() { - if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { - mConfigureWifiSettingsPreference.setSummary(getString( - isWifiWakeupEnabled() - ? R.string.wifi_configure_settings_preference_summary_wakeup_on - : R.string.wifi_configure_settings_preference_summary_wakeup_off)); - } + mConfigureWifiSettingsPreference.setSummary(getString( + isWifiWakeupEnabled() + ? R.string.wifi_configure_settings_preference_summary_wakeup_on + : R.string.wifi_configure_settings_preference_summary_wakeup_off)); final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks(); final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();