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

Commit 8ef71b41 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am ecfc9ca5: Merge into jb-mr1-dev 

* commit 'ecfc9ca5':
  Use global wifi_sleep_policy constants
parents 76ed3daa ecfc9ca5

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

+5 −5
Original line number Diff line number Diff line
@@ -1090,14 +1090,14 @@ public class WifiService extends IWifiManager.Stub { 
         */

        private boolean shouldWifiStayAwake(int stayAwakeConditions, int pluggedType) {

            //Never sleep as long as the user has not changed the settings

            int wifiSleepPolicy = Settings.System.getInt(mContext.getContentResolver(),

                    Settings.System.WIFI_SLEEP_POLICY,

                    Settings.System.WIFI_SLEEP_POLICY_NEVER);

            int wifiSleepPolicy = Settings.Global.getInt(mContext.getContentResolver(),

                    Settings.Global.WIFI_SLEEP_POLICY,

                    Settings.Global.WIFI_SLEEP_POLICY_NEVER);



            if (wifiSleepPolicy == Settings.System.WIFI_SLEEP_POLICY_NEVER) {

            if (wifiSleepPolicy == Settings.Global.WIFI_SLEEP_POLICY_NEVER) {

                // Never sleep

                return true;

            } else if ((wifiSleepPolicy == Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED) &&

            } else if ((wifiSleepPolicy == Settings.Global.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED) &&

                    (pluggedType != 0)) {

                // Never sleep while plugged, and we're plugged

                return true;