diff options
| author | 2017-01-31 16:54:44 +0000 | |
|---|---|---|
| committer | 2017-01-31 16:54:48 +0000 | |
| commit | 9deb6b5a3a1ee9ed0eaa646e918ac131fb50b19c (patch) | |
| tree | a0e0dc3e0cb62bf4655bafbefe247fb67ad1f43f | |
| parent | de0fb617a198babe1a67c0dc921d0e7703f73384 (diff) | |
| parent | cd62f3aed68b35ac6e1f4f7b0594c695663fc8ba (diff) | |
Merge "Added a new wifi_badging_thresholds setting to Settings.Global"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 4c194d762e54..c8b48d7d1615 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -36829,6 +36829,7 @@ package android.provider { field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail"; field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger"; field public static final java.lang.String WEBVIEW_MULTIPROCESS = "webview_multiprocess"; + field public static final java.lang.String WIFI_BADGING_THRESHOLDS = "wifi_badging_thresholds"; field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown"; field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count"; field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9bc7034d1e19..d71ce346c0ce 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8082,6 +8082,17 @@ public final class Settings { public static final String NETWORK_AVOID_BAD_WIFI = "network_avoid_bad_wifi"; /** + * The thresholds of the wifi throughput badging (SD, HD etc.) as a comma-delimited list of + * colon-delimited key-value pairs. The key is the badging enum value defined in + * android.net.ScoredNetwork and the value is the minimum sustained network throughput in + * kbps required for the badge. For example: "10:3000,20:5000,30:25000" + * + * @hide + */ + @SystemApi + public static final String WIFI_BADGING_THRESHOLDS = "wifi_badging_thresholds"; + + /** * Whether Wifi display is enabled/disabled * 0=disabled. 1=enabled. * @hide |