diff options
| author | Jeff Davidson <jpd@google.com> | 2014-12-17 20:58:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 20:58:44 +0000 |
| commit | 38e8763df55ebedcf65178f8acced806113af4a5 (patch) | |
| tree | 9546d6b4e088ba7e7b19afc0b004cd30237dec42 /core/java/android/provider | |
| parent | 2045d5f3a23f8e462d05acf6d6cf6ea08e236a1e (diff) | |
| parent | 0b3718d6b157bf15db9d709d50019f81f06195b9 (diff) | |
| download | frameworks_base-38e8763df55ebedcf65178f8acced806113af4a5.zip frameworks_base-38e8763df55ebedcf65178f8acced806113af4a5.tar.gz frameworks_base-38e8763df55ebedcf65178f8acced806113af4a5.tar.bz2 | |
am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183
* commit '0b3718d6b157bf15db9d709d50019f81f06195b9':
Add global setting for ephemeral network timeout.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 555f64c..838686a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5924,6 +5924,18 @@ public final class Settings { public static final String WIFI_REENABLE_DELAY_MS = "wifi_reenable_delay"; /** + * Timeout for ephemeral networks when all known BSSIDs go out of range. We will disconnect + * from an ephemeral network if there is no BSSID for that network with a non-null score that + * has been seen in this time period. + * + * If this is less than or equal to zero, we use a more conservative behavior and only check + * for a non-null score from the currently connected or target BSSID. + * @hide + */ + public static final String WIFI_EPHEMERAL_OUT_OF_RANGE_TIMEOUT_MS = + "wifi_ephemeral_out_of_range_timeout_ms"; + + /** * The number of milliseconds to delay when checking for data stalls during * non-aggressive detection. (screen is turned off.) * @hide |