am 92bb3df5: Merge "Extend the time between WiFi energy samples" into mnc-dev

* commit '92bb3df50b76a74f09e8663396b44e30e609f297': Extend the time between WiFi energy samples
2015-06-23 21:22:37 +00:00
parent a0ef32ec3f 92bb3df50b
commit 0aa80efc0f
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1560,7 +1560,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                NetworkCapabilities.TRANSPORT_WIFI)) {
            timeout = Settings.Global.getInt(mContext.getContentResolver(),
                                             Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI,
-                                             5);
+                                             15);
            type = ConnectivityManager.TYPE_WIFI;
        } else {
            // do not track any other networks