summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-08-18 16:08:14 -0700
committerRoshan Pius <rpius@google.com>2017-08-18 16:08:14 -0700
commit51f2ad7de7fd5b6189531a923f1666a3d8aa820b (patch)
treec888ea8dfe85b925fc40bcc8e4b08d6f2cfcd12f
parent0af8182c7a421108aff122440724ecc5d1e4c6d7 (diff)
downloadandroid_frameworks_opt_net_wifi-51f2ad7de7fd5b6189531a923f1666a3d8aa820b.tar.gz
android_frameworks_opt_net_wifi-51f2ad7de7fd5b6189531a923f1666a3d8aa820b.tar.bz2
android_frameworks_opt_net_wifi-51f2ad7de7fd5b6189531a923f1666a3d8aa820b.zip
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
-rw-r--r--service/java/com/android/server/wifi/WifiController.java6
1 files 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() {