diff options
author | Zhihai Xu <zhihaixu@google.com> | 2012-10-18 13:03:10 -0700 |
---|---|---|
committer | Zhihai Xu <zhihaixu@google.com> | 2012-10-18 13:03:10 -0700 |
commit | ec16c0ae42ca6092e543b553981e9f426838f237 (patch) | |
tree | 95b64e4534140ee21d83dc9244034aef778a4e13 /src | |
parent | 35bbbc6ca40c93c4174f426be295ea912aad82e0 (diff) | |
download | packages_apps_settings-ec16c0ae42ca6092e543b553981e9f426838f237.zip packages_apps_settings-ec16c0ae42ca6092e543b553981e9f426838f237.tar.gz packages_apps_settings-ec16c0ae42ca6092e543b553981e9f426838f237.tar.bz2 |
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
The root cause is normally when change the airplane mode, the bluetooth setting UI
will not be foreground. No listener is setup for bluetooth setting UI when it is
in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
won't be called. But for manta, airplane mode setting and bluetooth setting UI both
will show on the foreground due to bigger screen size. When we turn ariplane mode on,
bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.
Don't need to consider thread synchronization, because everything is running on the main thread.
bug 7366814
Change-Id: I138d1904df6cb17c7828295caa51a7d80abf99f2
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/bluetooth/BluetoothEnabler.java | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java index f08e083..2919e6f 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -37,13 +37,15 @@ import com.android.settings.WirelessSettings; public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeListener { private final Context mContext; private Switch mSwitch; - + private boolean mValidListener; private final LocalBluetoothAdapter mLocalAdapter; private final IntentFilter mIntentFilter; private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { + // Broadcast receiver is always running on the UI thread here, + // so we don't need consider thread synchronization. int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR); handleStateChanged(state); } @@ -52,6 +54,7 @@ public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeLis public BluetoothEnabler(Context context, Switch switch_) { mContext = context; mSwitch = switch_; + mValidListener = false; LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context); if (manager == null) { @@ -75,6 +78,7 @@ public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeLis mContext.registerReceiver(mReceiver, mIntentFilter); mSwitch.setOnCheckedChangeListener(this); + mValidListener = true; } public void pause() { @@ -84,19 +88,20 @@ public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeLis mContext.unregisterReceiver(mReceiver); mSwitch.setOnCheckedChangeListener(null); + mValidListener = false; } public void setSwitch(Switch switch_) { if (mSwitch == switch_) return; mSwitch.setOnCheckedChangeListener(null); mSwitch = switch_; - mSwitch.setOnCheckedChangeListener(this); + mSwitch.setOnCheckedChangeListener(mValidListener ? this : null); int bluetoothState = BluetoothAdapter.STATE_OFF; if (mLocalAdapter != null) bluetoothState = mLocalAdapter.getBluetoothState(); boolean isOn = bluetoothState == BluetoothAdapter.STATE_ON; boolean isOff = bluetoothState == BluetoothAdapter.STATE_OFF; - mSwitch.setChecked(isOn); + setChecked(isOn); mSwitch.setEnabled(isOn || isOff); } @@ -121,19 +126,33 @@ public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeLis mSwitch.setEnabled(false); break; case BluetoothAdapter.STATE_ON: - mSwitch.setChecked(true); + setChecked(true); mSwitch.setEnabled(true); break; case BluetoothAdapter.STATE_TURNING_OFF: mSwitch.setEnabled(false); break; case BluetoothAdapter.STATE_OFF: - mSwitch.setChecked(false); + setChecked(false); mSwitch.setEnabled(true); break; default: - mSwitch.setChecked(false); + setChecked(false); mSwitch.setEnabled(true); } } + + private void setChecked(boolean isChecked) { + if (isChecked != mSwitch.isChecked()) { + // set listener to null, so onCheckedChanged won't be called + // if the checked status on Switch isn't changed by user click + if (mValidListener) { + mSwitch.setOnCheckedChangeListener(null); + } + mSwitch.setChecked(isChecked); + if (mValidListener) { + mSwitch.setOnCheckedChangeListener(this); + } + } + } } |