From 51f2ad7de7fd5b6189531a923f1666a3d8aa820b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 18 Aug 2017 16:08:14 -0700 Subject: WifiController: Set the sleep policy to "never" The UI to toggle this setting was removed in ag/2226326. So, stop reading this parameter so that we don't have untested behavior on devices that upgrade from N with this setting set to a non-default value. Bug: 64830584 Test: None Change-Id: Ie5b4b97e519adca030d57dcf5d59471b17ec435b --- service/java/com/android/server/wifi/WifiController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index c1b186142..494ce86e5 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -248,9 +248,9 @@ public class WifiController extends StateMachine { } private void readWifiSleepPolicy() { - mSleepPolicy = mFacade.getIntegerSetting(mContext, - Settings.Global.WIFI_SLEEP_POLICY, - Settings.Global.WIFI_SLEEP_POLICY_NEVER); + // This should always set to default value because the settings menu to toggle this + // has been removed now. + mSleepPolicy = Settings.Global.WIFI_SLEEP_POLICY_NEVER; } private void readWifiReEnableDelay() { -- cgit v1.2.3