Use def_wifi_idle_ms to fetch WIFI_IDLE_MS defaults

Change-Id: I060f2bb4611a2fc1576fd619acc6c87c784b4abf
(cherry picked from commit 1e35a44465528dd552f8907be75d7dbc0d18e96a)

1 files changed, 4 insertions, 10 deletions

diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java
index 58e488294..600b41e01 100644
--- a/service/java/com/android/server/wifi/WifiController.java
+++ b/service/java/com/android/server/wifi/WifiController.java
@@ -57,21 +57,13 @@ class WifiController extends StateMachine {
     private long mIdleMillis;
     private int mSleepPolicy;
     private boolean mFirstUserSignOnSeen = false;
+    private int mDefaultWifiIdleMs;
 
     private AlarmManager mAlarmManager;
     private PendingIntent mIdleIntent;
     private static final int IDLE_REQUEST = 0;
 
     /**
-     * See {@link Settings.Global#WIFI_IDLE_MS}. This is the default value if a
-     * Settings.Global value is not present. This timeout value is chosen as
-     * the approximate point at which the battery drain caused by Wi-Fi
-     * being enabled but not active exceeds the battery drain caused by
-     * re-establishing a connection to the mobile data network.
-     */
-    private static final long DEFAULT_IDLE_MS = 15 * 60 * 1000; /* 15 minutes */
-
-    /**
      * See {@link Settings.Global#WIFI_REENABLE_DELAY_MS}.  This is the default value if a
      * Settings.Global value is not present.  This is the minimum time after wifi is disabled
      * we'll act on an enable.  Enable requests received before this delay will be deferred.
@@ -139,6 +131,8 @@ class WifiController extends StateMachine {
         mWifiStateMachine = service.mWifiStateMachine;
         mSettingsStore = service.mSettingsStore;
         mLocks = service.mLocks;
+        mDefaultWifiIdleMs = context.getResources().getInteger(com.android.internal.
+            R.integer.def_wifi_idle_ms);
 
         mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
         Intent idleIntent = new Intent(ACTION_DEVICE_IDLE, null);
@@ -223,7 +217,7 @@ class WifiController extends StateMachine {
 
     private void readWifiIdleTime() {
         mIdleMillis = Settings.Global.getLong(mContext.getContentResolver(),
-                Settings.Global.WIFI_IDLE_MS, DEFAULT_IDLE_MS);
+                Settings.Global.WIFI_IDLE_MS, mDefaultWifiIdleMs);
     }
 
     private void readWifiSleepPolicy() {