summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-20 07:38:33 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-20 07:38:33 -0800
commit90e190609a1d6894bc8ef102b1cccd3c1578d784 (patch)
tree0d80b9fad39c5eae0e2bb83013190ca6ffaf2be7 /src/com/android
parent477296898777d0bdf41fc49c047a6b9374f27fe1 (diff)
downloadpackages_apps_Settings-90e190609a1d6894bc8ef102b1cccd3c1578d784.tar.gz
packages_apps_Settings-90e190609a1d6894bc8ef102b1cccd3c1578d784.tar.bz2
packages_apps_Settings-90e190609a1d6894bc8ef102b1cccd3c1578d784.zip
auto import from //branches/cupcake/...@132569
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/bluetooth/BluetoothEventRedirector.java4
-rw-r--r--src/com/android/settings/bluetooth/LocalBluetoothDevice.java3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index a588013f3..2ad5726dd 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
@@ -92,7 +92,7 @@ public class BluetoothEventRedirector {
int oldState = intent.getIntExtra(BluetoothIntent.HEADSET_PREVIOUS_STATE, 0);
if (newState == BluetoothHeadset.STATE_DISCONNECTED &&
oldState == BluetoothHeadset.STATE_CONNECTING) {
- mManager.getLocalDeviceManager().onConnectingError(address);
+ Log.i(TAG, "Failed to connect BT headset");
}
} else if (action.equals(BluetoothA2dp.SINK_STATE_CHANGED_ACTION)) {
@@ -102,7 +102,7 @@ public class BluetoothEventRedirector {
int oldState = intent.getIntExtra(BluetoothA2dp.SINK_PREVIOUS_STATE, 0);
if (newState == BluetoothA2dp.STATE_DISCONNECTED &&
oldState == BluetoothA2dp.STATE_CONNECTING) {
- mManager.getLocalDeviceManager().onConnectingError(address);
+ Log.i(TAG, "Failed to connect BT A2DP");
}
} else if (action.equals(BluetoothIntent.REMOTE_DEVICE_CLASS_UPDATED_ACTION)) {
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
index ac25535ba..a4885401e 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
@@ -30,6 +30,7 @@ import android.content.res.Resources;
import android.os.IBinder;
import android.os.RemoteException;
import android.text.TextUtils;
+import android.util.Log;
import android.view.ContextMenu;
import android.view.Menu;
import android.view.MenuItem;
@@ -190,7 +191,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
int status = profileManager.getConnectionStatus(mAddress);
if (!SettingsBtStatus.isConnectionStatusConnected(status)) {
if (profileManager.connect(mAddress) != BluetoothDevice.RESULT_SUCCESS) {
- showConnectingError();
+ Log.i(TAG, "Failed to connect " + profile.toString() + " to " + mName);
}
}
}