drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I305c181c into eclair

Browse Source 
* changes:
  Delay 500ms between each registering each SDP record using sdptool.
This commit is contained in:
Android (Google) Code Review
2009-10-12 14:05:44 -04:00
parent f836acf241 bc1fc05c1b
commit d301c90446
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,7 @@ public class BluetoothService extends IBluetooth.Stub {
return false; return false;
} }
setBluetoothState(BluetoothAdapter.STATE_TURNING_OFF); setBluetoothState(BluetoothAdapter.STATE_TURNING_OFF);
mHandler.removeMessages(MESSAGE_REGISTER_SDP_RECORDS);
// Allow 3 seconds for profiles to gracefully disconnect // Allow 3 seconds for profiles to gracefully disconnect
// TODO: Introduce a callback mechanism so that each profile can notify // TODO: Introduce a callback mechanism so that each profile can notify
@ -327,12 +328,39 @@ public class BluetoothService extends IBluetooth.Stub {
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {
case MESSAGE_REGISTER_SDP_RECORDS: case MESSAGE_REGISTER_SDP_RECORDS:
//TODO: Don't assume HSP/HFP is running, don't use sdptool, if (!isEnabled()) {
if (isEnabled()) { return;
}
// SystemService.start() forks sdptool to register service
// records. It can fail to register some records if it is
// forked multiple times in a row, probably because there is
// some race in sdptool or bluez when operated in parallel.
// As a workaround, delay 500ms between each fork of sdptool.
// TODO: Don't fork sdptool in order to regsiter service
// records, use a DBUS call instead.
switch (msg.arg1) {
case 1:
Log.d(TAG, "Registering hsag record");
SystemService.start("hsag"); SystemService.start("hsag");
mHandler.sendMessageDelayed(
mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS, 2, -1), 500);
break;
case 2:
Log.d(TAG, "Registering hfag record");
SystemService.start("hfag"); SystemService.start("hfag");
mHandler.sendMessageDelayed(
mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS, 3, -1), 500);
break;
case 3:
Log.d(TAG, "Registering opush record");
SystemService.start("opush"); SystemService.start("opush");
mHandler.sendMessageDelayed(
mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS, 4, -1), 500);
break;
case 4:
Log.d(TAG, "Registering pbap record");
SystemService.start("pbap"); SystemService.start("pbap");
break;
} }
break; break;
case MESSAGE_FINISH_DISABLE: case MESSAGE_FINISH_DISABLE:
@ -402,8 +430,8 @@ public class BluetoothService extends IBluetooth.Stub {
} }
mIsDiscovering = false; mIsDiscovering = false;
mBondState.loadBondState(); mBondState.loadBondState();
mHandler.sendMessageDelayed(mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS), mHandler.sendMessageDelayed(
3000); mHandler.obtainMessage(MESSAGE_REGISTER_SDP_RECORDS, 1, -1), 3000);
// Log bluetooth on to battery stats. // Log bluetooth on to battery stats.
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();