Merge "Revert "Adding per UID WiFi power distribution.""

2015-04-07 06:19:47 +00:00
parent 5b0e313699 0e40aa8377
commit ac46e19cc6
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
@@ -1487,7 +1487,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                NetworkCapabilities.TRANSPORT_WIFI)) {
            timeout = Settings.Global.getInt(mContext.getContentResolver(),
                                             Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI,
-                                             5);
+                                             0);
            type = ConnectivityManager.TYPE_WIFI;
        } else {
            // do not track any other networks