From 70c35ef0710f26768ce3b362d546be2ca5f346f1 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 16 May 2013 11:29:55 -0700 Subject: [PATCH] Disable On/OFF switch before action Bug: 8715336 Change-Id: I3d4b05ae9dfe109af0b9b06340d52004b73ad0f4 Signed-off-by: Dmitry Shmidt --- src/com/android/settings/wifi/WifiEnabler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 846c324cfc..87d1caf8dd 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -119,11 +119,10 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { mWifiManager.setWifiApEnabled(null, false); } - if (mWifiManager.setWifiEnabled(isChecked)) { - // Intent has been taken into account, disable until new state is active - mSwitch.setEnabled(false); - } else { + mSwitch.setEnabled(false); + if (!mWifiManager.setWifiEnabled(isChecked)) { // Error + mSwitch.setEnabled(true); Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show(); } } -- 2.11.0