Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2010-09-20 17:03:15 -07:00
committed by Android (Google) Code Review
parent 4db643eb84 c8314b05b4
commit e25a264c4e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/WifiService.java
View File

@@ -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 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 * 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); mWifiStateTracker.updateBatteryWorkSourceLocked(mTmpWorkSource);
sWakeLock.setWorkSource(mTmpWorkSource);
} }
} }