diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-03 19:02:44 -0700 |
---|---|---|
committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-03 19:10:26 -0700 |
commit | f2102f7a1a26d399cc60c516ed7d90ef660de055 (patch) | |
tree | ef5a798c8adddd8fc300cdfe9766581b97e12b79 /core/java | |
parent | 7e74c60db5261ea137c8f6672f8573873eb5814e (diff) | |
download | frameworks_base-f2102f7a1a26d399cc60c516ed7d90ef660de055.zip frameworks_base-f2102f7a1a26d399cc60c516ed7d90ef660de055.tar.gz frameworks_base-f2102f7a1a26d399cc60c516ed7d90ef660de055.tar.bz2 |
Add auto-restore timeout for secondary networks.
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.
Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/net/NetworkConfig.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkConfig.java b/core/java/android/net/NetworkConfig.java index 6e774a6..3cc0bc5 100644 --- a/core/java/android/net/NetworkConfig.java +++ b/core/java/android/net/NetworkConfig.java @@ -50,6 +50,13 @@ public class NetworkConfig { public boolean dependencyMet; /** + * indicates the default restoral timer in seconds + * if the network is used as a special network feature + * -1 indicates no restoration of default + */ + public int restoreTime; + + /** * input string from config.xml resource. Uses the form: * [Connection name],[ConnectivityManager connection type], * [associated radio-type],[priority],[dependencyMet] @@ -60,7 +67,8 @@ public class NetworkConfig { type = Integer.parseInt(fragments[1]); radio = Integer.parseInt(fragments[2]); priority = Integer.parseInt(fragments[3]); - dependencyMet = Boolean.parseBoolean(fragments[4]); + restoreTime = Integer.parseInt(fragments[4]); + dependencyMet = Boolean.parseBoolean(fragments[5]); } /** |