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

Commit 0ce12e21 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake... 

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

Merge commit 'e25a264c' into gingerbread-plus-aosp

* commit 'e25a264c':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
parents 65b5a65e e25a264c

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);

        }

    }