diff options
| author | Erik Kline <ek@google.com> | 2014-12-10 07:29:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-10 07:29:47 +0000 |
| commit | 33cd463bbbbe47010ed44815fbfd0ab5e8fbf825 (patch) | |
| tree | b9d1e03e3c6396813be8673ea46729b7bc4ad8c0 /core/java/android | |
| parent | 7cc203d73418316628818883ea66ad8f1eebaf45 (diff) | |
| parent | 8f29dcfb53350cf687112ac79a806e4d34dfa22b (diff) | |
| download | frameworks_base-33cd463bbbbe47010ed44815fbfd0ab5e8fbf825.zip frameworks_base-33cd463bbbbe47010ed44815fbfd0ab5e8fbf825.tar.gz frameworks_base-33cd463bbbbe47010ed44815fbfd0ab5e8fbf825.tar.bz2 | |
Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 14 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index fa87c80..7d5db85 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -101,7 +101,7 @@ public class ConnectivityManager { /** * Identical to {@link #CONNECTIVITY_ACTION} broadcast, but sent without any - * applicable {@link Settings.Global#CONNECTIVITY_CHANGE_DELAY}. + * historic {@link Settings.Global#CONNECTIVITY_CHANGE_DELAY}. * * @hide */ @@ -429,18 +429,6 @@ public class ConnectivityManager { public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI; /** - * Default value for {@link Settings.Global#CONNECTIVITY_CHANGE_DELAY} in - * milliseconds. This was introduced because IPv6 routes seem to take a - * moment to settle - trying network activity before the routes are adjusted - * can lead to packets using the wrong interface or having the wrong IP address. - * This delay is a bit crude, but in the future hopefully we will have kernel - * notifications letting us know when it's safe to use the new network. - * - * @hide - */ - public static final int CONNECTIVITY_CHANGE_DELAY_DEFAULT = 3000; - - /** * @hide */ public final static int REQUEST_ID_UNSET = 0; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 0062eb2..555f64c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6128,7 +6128,7 @@ public final class Settings { /** * The number of milliseconds to delay before sending out - * {@link ConnectivityManager#CONNECTIVITY_ACTION} broadcasts. + * {@link ConnectivityManager#CONNECTIVITY_ACTION} broadcasts. Ignored. * * @hide */ |