diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-25 04:46:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-25 04:46:39 +0000 |
| commit | b214599552eb1189510179f8aa35eb0339768932 (patch) | |
| tree | 48f9dd006fc91c39045609be4c710c3ba55555c0 /core/java | |
| parent | d3450b6aa2dfc56150e3ec2320047339a5c181ab (diff) | |
| parent | f5a44fafbeaa91ad59ba8ee0d27fe5b6f0f3d017 (diff) | |
Merge changes from topic "carrier_net_notifier"
* changes:
Adds SystemMessage for CarrierNetworkNotification
Carrier Network Notification strings
Carrier Network Available Notification setting
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index baa90e75d589..1ea486187935 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9155,6 +9155,22 @@ public final class Settings { BOOLEAN_VALIDATOR; /** + * Whether to notify the user of carrier networks. + * <p> + * 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} */ public static final String WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON = @@ -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); } /** |