commit 307aef01257cbba42f095f7020a4a3b753f3807b
author Mike Lockwood <lockwood@android.com> Mon Sep 20 17:16:03 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 20 17:16:03 2010 -0700
tree a93354e8c7a27ed579d535c197b607be6b65ab6c
parent e25a264c4e3739913798d9b7d91af5dc964b0f15
parent e15735a9e0c0b1448b68f2d6b3247404fc1df417

Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread

services/java/com/android/server/WifiService.java

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 371f22e..87329e3 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -145,7 +145,7 @@
      */
     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 @@
                 }
             }
             mWifiStateTracker.updateBatteryWorkSourceLocked(mTmpWorkSource);
+            sWakeLock.setWorkSource(mTmpWorkSource);
         }
     }