Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev

2016-12-22 20:41:54 +00:00
parent 1cc8a2a617 57f383709b
commit f6d8e1f635
1 changed files with 7 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7593,6 +7593,13 @@ public final class Settings {
       public static final String WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON =
               "wimax_networks_available_notification_on";

+       /**
+        * Whether we support connecting to Carrier Networks.
+        * @hide
+        **/
+        public static final String WIFI_CONNECT_CARRIER_NETWORKS =
+               "wifi_connect_carrier_networks";
+
       /**
        * Delay (in seconds) before repeating the Wi-Fi networks available notification.
        * Connecting to a network will reset the timer.