From c8314b05b4f283873e65df9209f3426a201ca6ad Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 20 Sep 2010 11:34:11 -0700
Subject: [PATCH] DO NOT MERGE.  Wifi service now blames apps for its wake lock
 use.

Change-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8
---
 services/java/com/android/server/WifiService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 371f22ee085ec..87329e3156ade 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -145,7 +145,7 @@ public class WifiService extends IWifiManager.Stub {
      */
     private static final long DEFAULT_IDLE_MILLIS = 15 * 60 * 1000; /* 15 minutes */
 
-    private static final String WAKELOCK_TAG = "WifiService";
+    private static final String WAKELOCK_TAG = "*wifi*";
 
     /**
      * The maximum amount of time to hold the wake lock after a disconnect
@@ -1825,6 +1825,7 @@ public class WifiService extends IWifiManager.Stub {
                 }
             }
             mWifiStateTracker.updateBatteryWorkSourceLocked(mTmpWorkSource);
+            sWakeLock.setWorkSource(mTmpWorkSource);
         }
     }