Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev

Browse Source 
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
This commit is contained in:
Sharvil Nanavati
2015-06-23 14:07:26 -07:00
parent c8a94c5b6d 7c2500564b
commit 64a4858b32
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -18,6 +18,7 @@ package com.android.server;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothProfile;
import android.bluetooth.IBluetooth; import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothGatt; import android.bluetooth.IBluetoothGatt;
@@ -113,6 +114,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
private static final int SERVICE_IBLUETOOTH = 1; private static final int SERVICE_IBLUETOOTH = 1;
private static final int SERVICE_IBLUETOOTHGATT = 2; private static final int SERVICE_IBLUETOOTHGATT = 2;
private static final String[] DEVICE_TYPE_NAMES = new String[] {
"???",
"BR/EDR",
"LE",
"DUAL"
};
private final Context mContext; private final Context mContext;
// Locks are not provided for mName and mAddress. // Locks are not provided for mName and mAddress.
@@ -1531,6 +1539,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
writer.println("Bluetooth Service not connected"); writer.println("Bluetooth Service not connected");
} else { } else {
try { try {
writer.println("Bonded devices:");
for (BluetoothDevice device : mBluetooth.getBondedDevices()) {
writer.println(" " + device.getAddress() +
" [" + DEVICE_TYPE_NAMES[device.getType()] + "] " +
device.getName());
}
writer.flush();
writer.println(mBluetooth.dump()); writer.println(mBluetooth.dump());
} catch (RemoteException re) { } catch (RemoteException re) {
writer.println("RemoteException while calling Bluetooth Service"); writer.println("RemoteException while calling Bluetooth Service");