am de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev (5b0e875d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/TetherSettings.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -374,12 +374,6 @@ public class TetherSettings extends SettingsPreferenceFragment

		private void updateBluetoothState(String[] available, String[] tethered,
		String[] errored) {
		int bluetoothTethered = 0;
		for (String s : tethered) {
		for (String regex : mBluetoothRegexs) {
		if (s.matches(regex)) bluetoothTethered++;
		}
		}
		boolean bluetoothErrored = false;
		for (String s: errored) {
		for (String regex : mBluetoothRegexs) {
		@@ -399,6 +393,7 @@ public class TetherSettings extends SettingsPreferenceFragment
		mBluetoothPan != null && mBluetoothPan.isTetheringOn()) {
		mBluetoothTether.setChecked(true);
		mBluetoothTether.setEnabled(true);
		int bluetoothTethered = mBluetoothPan.getConnectedDevices().size();
		if (bluetoothTethered > 1) {
		String summary = getString(
		R.string.bluetooth_tethering_devices_connected_subtext, bluetoothTethered);