diff options
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b94f0b91b5e5..ae49580fe43d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3668,13 +3668,20 @@ public final class Settings { Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS; /** - * Whether background data usage is allowed. - * - * @deprecated As of {@link VERSION_CODES#ICE_CREAM_SANDWICH}, - * availability of background data depends on several - * combined factors. When background data is unavailable, - * {@link ConnectivityManager#getActiveNetworkInfo()} will - * now appear disconnected. + * Ethernet related configurations + */ + public static final String ETHERNET_ON = "ethernet_on"; + public static final String ETHERNET_MODE = "ethernet_mode"; + public static final String ETHERNET_IP = "ethernet_ip"; + public static final String ETHERNET_MASK = "ethernet_netmask"; + public static final String ETHERNET_DNS = "ethernet_dns"; + public static final String ETHERNET_ROUTE = "ethernet_iproute"; + public static final String ETHERNET_CONF = "ethernet_conf"; + public static final String ETHERNET_IFNAME = "ethernet_ifname"; + + /** + * Whether background data usage is allowed by the user. See + * ConnectivityManager for more info. */ @Deprecated public static final String BACKGROUND_DATA = "background_data"; |