From bb0773fac888c6748cbf778ab5c99c7d0a2c1309 Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Thu, 11 Nov 2010 15:10:46 -0800 Subject: Fix crash in dump function. Change-Id: I5a4cd7cf3fd325ced5d05f036c191f759dee16e0 --- core/java/android/server/BluetoothService.java | 50 +++++++++++++------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'core') diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index ec8f031..01a6b94 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -2508,44 +2508,42 @@ public class BluetoothService extends IBluetooth.Stub { // dump pw.println("\n--Headset Service--"); if (mBluetoothHeadset != null) { - List deviceList = mBluetoothHeadset.getConnectedDevices(); - if (deviceList.size() == 0) { - pw.println("\n--No headsets connected--"); - } - BluetoothDevice device = deviceList.get(0); - - switch (mBluetoothHeadset.getConnectionState(device)) { - case BluetoothHeadset.STATE_DISCONNECTED: - pw.println("getConnectionState() = STATE_DISCONNECTED"); - break; - case BluetoothHeadset.STATE_CONNECTING: - pw.println("getConnectionState() = STATE_CONNECTING"); - break; - case BluetoothHeadset.STATE_CONNECTED: - pw.println("getConnectionState() = STATE_CONNECTED"); - break; - case BluetoothHeadset.STATE_DISCONNECTING: - pw.println("getConnectionState() = STATE_DISCONNECTING"); - break; - case BluetoothHeadset.STATE_AUDIO_CONNECTED: - pw.println("getConnectionState() = STATE_AUDIO_CONNECTED"); - break; + List deviceList = mBluetoothHeadset.getConnectedDevices(); + if (deviceList.size() == 0) { + pw.println("\n--No headsets connected--"); + } else { + BluetoothDevice device = deviceList.get(0); + pw.println("\ngetConnectedDevices[0] = " + device); + + switch (mBluetoothHeadset.getConnectionState(device)) { + case BluetoothHeadset.STATE_CONNECTING: + pw.println("getConnectionState() = STATE_CONNECTING"); + break; + case BluetoothHeadset.STATE_CONNECTED: + pw.println("getConnectionState() = STATE_CONNECTED"); + break; + case BluetoothHeadset.STATE_DISCONNECTING: + pw.println("getConnectionState() = STATE_DISCONNECTING"); + break; + case BluetoothHeadset.STATE_AUDIO_CONNECTED: + pw.println("getConnectionState() = STATE_AUDIO_CONNECTED"); + break; + } + pw.println("getBatteryUsageHint() = " + + mBluetoothHeadset.getBatteryUsageHint(device)); } deviceList.clear(); deviceList = mBluetoothHeadset.getDevicesMatchingConnectionStates(new int[] { BluetoothProfile.STATE_CONNECTED, BluetoothProfile.STATE_DISCONNECTED}); pw.println("\n--Connected and Disconnected Headsets"); - for (BluetoothDevice dev: deviceList) { + for (BluetoothDevice device: deviceList) { pw.println(device); if (mBluetoothHeadset.isAudioConnected(device)) { pw.println("SCO audio connected to device:" + device); } } - pw.println("\ngetCurrentHeadset() = " + device); - pw.println("getBatteryUsageHint() = " + - mBluetoothHeadset.getBatteryUsageHint(device)); mAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset); } -- cgit v1.1