am 35d875ad: am 77b25796: Merge "Setup idletimer for network interface." into jb-mr1-dev

* commit '35d875ade38abd8dba6b7756ca612167ce8bcad0':
  Setup idletimer for network interface.
This commit is contained in:
Ashish Sharma
2012-08-10 16:09:34 -07:00
committed by Android Git Automerger

View File

@@ -1912,6 +1912,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
setupDataActivityTracking(type); setupDataActivityTracking(type);
setupDataActivityTracking(type);
// snapshot isFailover, because sendConnectedBroadcast() resets it // snapshot isFailover, because sendConnectedBroadcast() resets it
boolean isFailover = info.isFailover(); boolean isFailover = info.isFailover();
final String thisIface = thisNet.getLinkProperties().getInterfaceName(); final String thisIface = thisNet.getLinkProperties().getInterfaceName();