summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-08-23 06:42:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-23 06:42:47 +0000
commit94944ef94b8e6ec8d74be4783db4ce6c768a2683 (patch)
tree7f153b746b71e7c783bc34290c84155fd26d753a
parente681c8a86232adf813dbd50906af6bf784f672c4 (diff)
parent51f2ad7de7fd5b6189531a923f1666a3d8aa820b (diff)
Merge "WifiController: Set the sleep policy to "never"" into oc-mr1-dev
-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() {