diff options
| author | Erik Kline <ek@google.com> | 2014-10-22 18:13:18 +0900 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2014-10-31 14:07:33 +0900 |
| commit | 8e3f4fbdf6e562f4f5731b98e327e8af33b75c4c (patch) | |
| tree | d3dc40c630b7a60c375ca5c32044848952dd40ed /core | |
| parent | 0c189ca5c4ee8a61c89d437ff22fd2628b353765 (diff) | |
| download | frameworks_base-8e3f4fbdf6e562f4f5731b98e327e8af33b75c4c.zip frameworks_base-8e3f4fbdf6e562f4f5731b98e327e8af33b75c4c.tar.gz frameworks_base-8e3f4fbdf6e562f4f5731b98e327e8af33b75c4c.tar.bz2 | |
Remove CONNECTIVITY_CHANGE_DELAY and friends.
Once optimistic addresses become useable upon kernel notification
there will be no need for a connectivity delay.
This change requires kernel changes like:
https://android-review.googlesource.com/#/c/109934
Bug: 17769720
Change-Id: I8510c540aa655aad6a82ee322d591331357ee272
Diffstat (limited to 'core')
| -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 9194ca8..bdc1c7f 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 369efac..85e3ded 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6117,7 +6117,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 */ |