PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed the display count of connected panu device." into jb-mr1-dev

Browse Source
This commit is contained in:
Matthew Xie
2012-09-10 12:05:19 -07:00
committed by Android (Google) Code Review
parent bfbdceffe6 6665ee3210
commit de10103302
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/TetherSettings.java
View File

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