commit de101033025c53ab8f16c31c57c003c757e47cec
author Matthew Xie <mattx@google.com> Mon Sep 10 12:05:19 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 12:05:20 2012 -0700
tree f13a8fc1ff883c21b35c094539f1fb51d2c02a40
parent bfbdceffe60e20a8db91b54cc81cfe49ea0dd96a
parent 6665ee321082b1c7c1afed640f99ce0ac225bdf6

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

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index ce53550..f6c1734 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -374,12 +374,6 @@
 
     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 @@
                     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);