Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e25a264c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 4db643eb c8314b05

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }