From febab7c4a8553b0616dd33d90a4bdff58ebc3d95 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Tue, 3 May 2011 19:01:21 -0700
Subject: Add auto-restore timeout for secondary networks.

NetworkAttribute layout changed in framework, so overlays need to be updated.

Change-Id: I59d0be5dd032d9ba41cc5d1727bd67157ddf3387
---
 overlay/frameworks/base/core/res/res/values/config.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d61dd5a..05ca381 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -114,14 +114,18 @@
          attributes.  This is used by the connectivity manager to decide which networks can coexist
          based on the hardware -->
     <!-- An Array of "[Connection name],[ConnectivityManager connection type],
-         [associated radio-type],[priority],[dependency-met]  -->
+         [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
+    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
+         before automatically restore the default connection.  Set -1 if the connection
+         does not require auto-restore. -->
+    <!-- the 6th element indicates boot-time dependency-met value. -->
     <string-array translatable="false" name="networkAttributes">
-        <item>"wifi,1,1,1,true"</item>
-        <item>"mobile,0,0,0,true"</item>
-        <item>"mobile_mms,2,0,2,true"</item>
-        <item>"mobile_supl,3,0,2,true"</item>
-        <item>"mobile_dun,4,0,4,true"</item>
-        <item>"mobile_hipri,5,0,3,true"</item>
+        <item>"wifi,1,1,1,-1,true"</item>
+        <item>"mobile,0,0,0,-1,true"</item>
+        <item>"mobile_mms,2,0,2,60000,true"</item>
+        <item>"mobile_supl,3,0,2,60000,true"</item>
+        <item>"mobile_dun,4,0,4,60000,true"</item>
+        <item>"mobile_hipri,5,0,3,60000,true"</item>
     </string-array>
 
     <!-- List of regexpressions describing the interface (if any) that represent tetherable
-- 
cgit v1.1