From 8aac82a5248e922bac2f84df746b5d1f34498f53 Mon Sep 17 00:00:00 2001 From: Danica Chang Date: Fri, 20 Aug 2010 14:22:07 -0700 Subject: Wait for bluetooth to turn on before Bluetooth Tethering is enabled Change-Id: I3fef94ea2cb102e1bb618f85e25d60c95cea1221 --- core/java/android/server/BluetoothService.java | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index ab78aeb0ba5a..1808656575da 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1256,12 +1256,32 @@ public class BluetoothService extends IBluetooth.Stub { return mTetheringOn; } - public synchronized void setBluetoothTethering(boolean value, String uuid, String bridge) { + private BroadcastReceiver mTetheringReceiver = null; + + public synchronized void setBluetoothTethering(boolean value, + final String uuid, final String bridge) { mTetheringOn = value; if (!value) { disconnectPan(); } - setBluetoothTetheringNative(value, uuid, bridge); + + if (getBluetoothState() != BluetoothAdapter.STATE_ON && mTetheringOn) { + IntentFilter filter = new IntentFilter(); + filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); + mTetheringReceiver = new BroadcastReceiver() { + @Override + public synchronized void onReceive(Context context, Intent intent) { + if (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF) + == BluetoothAdapter.STATE_ON) { + setBluetoothTethering(true, uuid, bridge); + mContext.unregisterReceiver(mTetheringReceiver); + } + } + }; + mContext.registerReceiver(mTetheringReceiver, filter); + } else { + setBluetoothTetheringNative(value, uuid, bridge); + } } public synchronized int getPanDeviceState(BluetoothDevice device) { -- cgit v1.2.3-59-g8ed1b