From 0e40aa8377de997906bb5a3a697c1f6d0e7cfd92 Mon Sep 17 00:00:00 2001
From: Bart Sears <bsears@google.com>
Date: Tue, 7 Apr 2015 06:14:04 +0000
Subject: [PATCH] Revert "Adding per UID WiFi power distribution."

This CL is breaking the clockwork settings app in master.  Reverting
until Adam has a chance to investigate.

This reverts commit 5ab174bac04aee9f10371fc2146299769fe782dd.

Change-Id: Ieb11423c11cf9874a6175dce49843d0e1080c590
---
 services/core/java/com/android/server/ConnectivityService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1ac1c8aa9b..eb394c3f5d 100644
--- 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