diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-12-17 10:40:52 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-12-17 10:40:52 +0700 |
| commit | 535e5f3d380d2555635dc675793ea872c47988f9 (patch) | |
| tree | e70fc1bfe4782ffdffc5158515cb0980ca6b36e1 /services | |
| parent | bec96948c8ea41c022fe7e68ccdfdaa1a1128871 (diff) | |
| download | frameworks_base-535e5f3d380d2555635dc675793ea872c47988f9.zip frameworks_base-535e5f3d380d2555635dc675793ea872c47988f9.tar.gz frameworks_base-535e5f3d380d2555635dc675793ea872c47988f9.tar.bz2 | |
WifiService: Fix wifi re-enabling after user exits airplane mode (lost in merge)
Same as I4b501139b660255fc935d6a12fd6ecf44d06ec6e, which was lost
in the merge
Change-Id: I0208731a35b81e2df8f6c45615fe16caed66b558
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index aef3426..afe607c 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -497,7 +497,8 @@ public class WifiService extends IWifiManager.Stub { mPersistWifiState.set(WIFI_ENABLED); } } else { - if (airplane) { + if (airplane && mPersistWifiState.get() != WIFI_ENABLED_AIRPLANE_OVERRIDE) { + // In this state, Wi-Fi will be re-enabled after airplane mode is off mPersistWifiState.set(WIFI_DISABLED_AIRPLANE_ON); } else { mPersistWifiState.set(WIFI_DISABLED); |