summaryrefslogtreecommitdiffstats
path: root/core/java/android/server/BluetoothBondState.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2011-08-02 15:44:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-02 15:44:28 -0700
commit4376b7f2d7bc092b9f41d6e05f245ff1be3bcc8d (patch)
treed01af2a078cc7d3cb45fefe4d0975d79f8810d6d /core/java/android/server/BluetoothBondState.java
parent8a32c6333ab44c79a55ffa4ad9de93a7e6df2bda (diff)
parent8594394aadeaaa3f834d33d7b198fb071e0f31fe (diff)
downloadframeworks_base-4376b7f2d7bc092b9f41d6e05f245ff1be3bcc8d.zip
frameworks_base-4376b7f2d7bc092b9f41d6e05f245ff1be3bcc8d.tar.gz
frameworks_base-4376b7f2d7bc092b9f41d6e05f245ff1be3bcc8d.tar.bz2
Merge "Move mBluetoothService.runBluetooth after broadcasting the STATE_ON intent."
Diffstat (limited to 'core/java/android/server/BluetoothBondState.java')
-rw-r--r--core/java/android/server/BluetoothBondState.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothBondState.java b/core/java/android/server/BluetoothBondState.java
index 30a8b2a..4e2608e 100644
--- a/core/java/android/server/BluetoothBondState.java
+++ b/core/java/android/server/BluetoothBondState.java
@@ -90,6 +90,7 @@ class BluetoothBondState {
IntentFilter filter = new IntentFilter();
filter.addAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
mContext.registerReceiver(mReceiver, filter);
+ readAutoPairingData();
}
synchronized void setPendingOutgoingBonding(String address) {