diff options
| author | San Mehat <san@google.com> | 2009-07-07 10:19:56 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-07 10:19:56 -0700 |
| commit | a15dd950e5d08fb015d4e57492fa68aa213eead7 (patch) | |
| tree | 41a5f28926a30340de89c47c088e962c4dc4985a /services/java/com/android/server/WifiService.java | |
| parent | fcc5be99e0497f25a12e77622c27b4de30e45b3d (diff) | |
| parent | fa6c7111fe58e09a92741c7655221c3629d3220e (diff) | |
| download | frameworks_base-a15dd950e5d08fb015d4e57492fa68aa213eead7.zip frameworks_base-a15dd950e5d08fb015d4e57492fa68aa213eead7.tar.gz frameworks_base-a15dd950e5d08fb015d4e57492fa68aa213eead7.tar.bz2 | |
am fa6c7111: WifiService: use wifi association state to determine if we should suspend wifi instead of the existance of an IP address.
Merge commit 'fa6c7111fe58e09a92741c7655221c3629d3220e'
* commit 'fa6c7111fe58e09a92741c7655221c3629d3220e':
WifiService: use wifi association state to determine if we should suspend wifi instead of
Diffstat (limited to 'services/java/com/android/server/WifiService.java')
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index ab6e49c..f3b0d1c 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -1577,8 +1577,9 @@ public class WifiService extends IWifiManager.Stub { * or plugged in to AC). */ if (!shouldWifiStayAwake(stayAwakeConditions, mPluggedType)) { - if (!mWifiStateTracker.hasIpAddress()) { - // do not keep Wifi awake when screen is off if Wifi is not fully active + WifiInfo info = mWifiStateTracker.requestConnectionInfo(); + if (info.getSupplicantState() != SupplicantState.COMPLETED) { + // do not keep Wifi awake when screen is off if Wifi is not associated mDeviceIdle = true; updateWifiState(); } else { |