diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index baa90e75d589b..1ea4861879356 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9154,6 +9154,22 @@ public final class Settings { private static final Validator WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR = BOOLEAN_VALIDATOR; + /** + * Whether to notify the user of carrier networks. + *

+ * If not connected and the scan results have a carrier network, we will + * put this notification up. If we attempt to connect to a network or + * the carrier network(s) disappear, we remove the notification. When we + * show the notification, we will not show it again for + * {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY} time. + * @hide + */ + public static final String WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON = + "wifi_carrier_networks_available_notification_on"; + + private static final Validator WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR = + BOOLEAN_VALIDATOR; + /** * {@hide} */ @@ -11261,6 +11277,7 @@ public final class Settings { NETWORK_RECOMMENDATIONS_ENABLED, WIFI_WAKEUP_ENABLED, WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, + WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON, USE_OPEN_WIFI_PACKAGE, WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, EMERGENCY_TONE, @@ -11307,6 +11324,8 @@ public final class Settings { VALIDATORS.put(PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_VALIDATOR); VALIDATORS.put(PRIVATE_DNS_SPECIFIER, PRIVATE_DNS_SPECIFIER_VALIDATOR); VALIDATORS.put(SOFT_AP_TIMEOUT_ENABLED, SOFT_AP_TIMEOUT_ENABLED_VALIDATOR); + VALIDATORS.put(WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON, + WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR); } /** diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d83db87e4832f..327b33bd00635 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3038,6 +3038,8 @@ Connect to open Wi\u2011Fi network + + Connect to carrier Wi\u2011Fi network Connecting to open Wi\u2011Fi network diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ee208734a49db..7938f1658dc4f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1912,6 +1912,7 @@ + diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index 7c6019e764166..db70184e9e9fa 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -196,6 +196,10 @@ message SystemMessage { // Inform the user that unexpectedly rapid network usage is happening NOTE_NET_RAPID = 45; + // Notify the user that carrier Wi-Fi networks are available. + // Package: android + NOTE_CARRIER_NETWORK_AVAILABLE = 46; + // ADD_NEW_IDS_ABOVE_THIS_LINE // Legacy IDs with arbitrary values appear below // Legacy IDs existed as stable non-conflicting constants prior to the O release