Merge "Decouple enabling of tethering with SDP record."

This commit is contained in:
Jaikumar Ganesh
2010-09-02 14:30:07 -07:00
committed by Android (Google) Code Review

View File

@@ -433,8 +433,7 @@ public class TetherSettings extends PreferenceActivity {
mBluetoothSettings.setEnabled(true); mBluetoothSettings.setEnabled(true);
} }
mBluetoothPan.setBluetoothTethering(true, mBluetoothPan.setBluetoothTethering(true);
BluetoothPan.NAP_ROLE, BluetoothPan.NAP_BRIDGE);
mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext); mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
} else { } else {
boolean errored = false; boolean errored = false;
@@ -448,9 +447,7 @@ public class TetherSettings extends PreferenceActivity {
errored = true; errored = true;
} }
mBluetoothPan.setBluetoothTethering(false, mBluetoothPan.setBluetoothTethering(false);
BluetoothPan.NAP_ROLE, BluetoothPan.NAP_BRIDGE);
mBluetoothSettings.setEnabled(false); mBluetoothSettings.setEnabled(false);
if (errored) { if (errored) {
mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext); mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);