Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wait for bluetooth to turn on before Bluetooth Tethering is enabled"

Browse Source
This commit is contained in:
Danica Chang
2010-08-20 17:42:28 -07:00
committed by Android (Google) Code Review
parent f7b472fa96 8aac82a524
commit 76dd2ce960
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/server/BluetoothService.java
View File

@@ -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) {