diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-20 17:06:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-20 17:06:12 -0700 |
| commit | 0ce12e210eaef554e96752af2553dadc431d6d09 (patch) | |
| tree | 43a0e7184071d5b5f08c9387095ac2227e2371f0 | |
| parent | 65b5a65e790458be0d6f70fafa9e151ba22a9e2e (diff) | |
| parent | e25a264c4e3739913798d9b7d91af5dc964b0f15 (diff) | |
| download | frameworks_base-0ce12e210eaef554e96752af2553dadc431d6d09.zip frameworks_base-0ce12e210eaef554e96752af2553dadc431d6d09.tar.gz frameworks_base-0ce12e210eaef554e96752af2553dadc431d6d09.tar.bz2 | |
am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp
* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
DO NOT MERGE. Wifi service now blames apps for its wake lock use.
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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); } } |