summaryrefslogtreecommitdiffstats
path: root/core/java/android/server/BluetoothBondState.java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-06-06 11:58:38 +0900
committerJaikumar Ganesh <jaikumar@google.com>2011-06-21 11:41:00 -0700
commitf7bc4bd13d630fedce6d14accfbc53345a4a438f (patch)
tree94edd5d20a655919391c9fd43351c4a35380e247 /core/java/android/server/BluetoothBondState.java
parent421f0101087bbede1152ccc6d8212f6686a10e54 (diff)
downloadframeworks_base-f7bc4bd13d630fedce6d14accfbc53345a4a438f.zip
frameworks_base-f7bc4bd13d630fedce6d14accfbc53345a4a438f.tar.gz
frameworks_base-f7bc4bd13d630fedce6d14accfbc53345a4a438f.tar.bz2
Fix crash during unpair.
Change-Id: I8901abbbb6593b78fb5df93ab5d0085b32b6ba94
Diffstat (limited to 'core/java/android/server/BluetoothBondState.java')
-rw-r--r--core/java/android/server/BluetoothBondState.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/server/BluetoothBondState.java b/core/java/android/server/BluetoothBondState.java
index a36cd24..39c3c88 100644
--- a/core/java/android/server/BluetoothBondState.java
+++ b/core/java/android/server/BluetoothBondState.java
@@ -79,6 +79,7 @@ class BluetoothBondState {
mService = service;
mBluetoothInputProfileHandler =
BluetoothInputProfileHandler.getInstance(mContext, mService);
+ getProfileProxy();
}
synchronized void setPendingOutgoingBonding(String address) {
@@ -131,10 +132,6 @@ class BluetoothBondState {
if (state == BluetoothDevice.BOND_BONDED) {
mService.addProfileState(address);
- } else if (state == BluetoothDevice.BOND_BONDING) {
- if (mA2dpProxy == null || mHeadsetProxy == null) {
- getProfileProxy();
- }
} else if (state == BluetoothDevice.BOND_NONE) {
mService.removeProfileState(address);
}