commit f37606b6792bdfbb2e4631df205e5970e36051b4
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 1fcbf9c581287d2c6a77ff1c7f66a34979c2ebcc
parent 994bd039e53ce712e502d595e40ad66cfd75db65

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