Merge change 22803 into eclair

* changes:
  Add uuids to adb shell dumpsys bluetooth

1 files changed, 13 insertions, 2 deletions

diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index a7c0425..6f5a3d6 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -1083,14 +1083,25 @@ public class BluetoothService extends IBluetooth.Stub {
 
         pw.println("\n--Known devices--");
         for (String address : mDeviceProperties.keySet()) {
+            int bondState = mBondState.getBondState(address);
             pw.printf("%s %10s (%d) %s\n", address,
-                       toBondStateString(mBondState.getBondState(address)),
+                       toBondStateString(bondState),
                        mBondState.getAttempt(address),
                        getRemoteName(address));
+            if (bondState == BluetoothDevice.BOND_BONDED) {
+                String[] uuids = getRemoteUuids(address);
+                if (uuids == null) {
+                    pw.printf("\tuuids = null\n");
+                } else {
+                    for (String uuid : uuids) {
+                        pw.printf("\t" + uuid);
+                    }
+                }
+            }
         }
 
         String value = getProperty("Devices");
-        String []devicesObjectPath = null;
+        String[] devicesObjectPath = null;
         if (value != null) {
             devicesObjectPath = value.split(",");
         }