commit 92bb3df50b76a74f09e8663396b44e30e609f297
author Adam Lesinski <adamlesinski@google.com> Tue Jun 23 21:12:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 21:12:35 2015 +0000
tree 52a2e393a0ae71b3f0986da87fa74a621f3eed85
parent ee52d2375fa885128567800483ab8a86cb63ec89
parent f9c93168dccfce42254d9b1df0ad14a2c135eea3

Merge "Extend the time between WiFi energy samples" into mnc-dev

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d9e5b75..e4f3f49 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1560,7 +1560,7 @@
                 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