Merge "Fix one NPE in tethering setting"

This commit is contained in:
Robert Greenwalt
2013-08-15 14:13:09 +00:00
committed by Gerrit Code Review

View File

@@ -385,6 +385,8 @@ public class TetherSettings extends SettingsPreferenceFragment
} }
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter == null)
return;
int btState = adapter.getState(); int btState = adapter.getState();
if (btState == BluetoothAdapter.STATE_TURNING_OFF) { if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
mBluetoothTether.setEnabled(false); mBluetoothTether.setEnabled(false);