diff options
| author | Syed Ibrahim M <syedibra@broadcom.com> | 2012-08-29 18:07:26 +0530 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-09-06 23:55:41 -0700 |
| commit | 1223e5a3115e825567972da26e38c0016bdfa268 (patch) | |
| tree | 35aa48d6cc7b2ee7e5194237a99a72968575090b | |
| parent | 369bb97d02209fa800081fc3b4e8675ea7e75d34 (diff) | |
| download | frameworks_base-1223e5a3115e825567972da26e38c0016bdfa268.zip frameworks_base-1223e5a3115e825567972da26e38c0016bdfa268.tar.gz frameworks_base-1223e5a3115e825567972da26e38c0016bdfa268.tar.bz2 | |
Fault tolerance in Bluedroid
When bluetooth process gets crashed/killed/stopped by Android
system, BluetoothManagerService will re-start AdapterService
to recover from the crash appropriately.
Change-Id: Iacb1a06a8245089517bbbd57de1378ca8ce4b41e
| -rwxr-xr-x | services/java/com/android/server/BluetoothManagerService.java | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java index 4b43070..9404dce 100755 --- a/services/java/com/android/server/BluetoothManagerService.java +++ b/services/java/com/android/server/BluetoothManagerService.java @@ -40,6 +40,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { private static final String SECURE_SETTINGS_BLUETOOTH_NAME="bluetooth_name"; private static final int TIMEOUT_BIND_MS = 3000; //Maximum msec to wait for a bind private static final int TIMEOUT_SAVE_MS = 500; //Maximum msec to wait for a save + //Maximum msec to wait for service restart + private static final int SERVICE_RESTART_TIME_MS = 200; private static final int MESSAGE_ENABLE = 1; private static final int MESSAGE_DISABLE = 2; @@ -49,6 +51,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { private static final int MESSAGE_UNREGISTER_STATE_CHANGE_CALLBACK = 31; private static final int MESSAGE_BLUETOOTH_SERVICE_CONNECTED = 40; private static final int MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED = 41; + private static final int MESSAGE_RESTART_BLUETOOTH_SERVICE = 42; private static final int MESSAGE_BLUETOOTH_STATE_CHANGE=60; private static final int MESSAGE_TIMEOUT_BIND =100; private static final int MESSAGE_TIMEOUT_UNBIND =101; @@ -660,8 +663,36 @@ class BluetoothManagerService extends IBluetoothManager.Stub { { if (DBG) Log.d(TAG, "MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED"); sendBluetoothServiceDownCallback(); + + // Send BT state broadcast to update + // the BT icon correctly + Message stateChangeMsg = mHandler.obtainMessage( + MESSAGE_BLUETOOTH_STATE_CHANGE); + stateChangeMsg.arg1 = BluetoothAdapter.STATE_ON; + stateChangeMsg.arg2 = + BluetoothAdapter.STATE_TURNING_OFF; + mHandler.sendMessage(stateChangeMsg); + synchronized(mConnection) { + mBluetooth = null; + } + // Send a Bluetooth Restart message + Message restartMsg = mHandler.obtainMessage( + MESSAGE_RESTART_BLUETOOTH_SERVICE); + mHandler.sendMessageDelayed(restartMsg, + SERVICE_RESTART_TIME_MS); break; } + case MESSAGE_RESTART_BLUETOOTH_SERVICE: + { + Log.d(TAG, "MESSAGE_RESTART_BLUETOOTH_SERVICE:" + +" Restart IBluetooth service"); + /* Enable without persisting the setting as + it doesnt change when IBluetooth + service restarts */ + handleEnable(false, mQuietEnable); + break; + } + case MESSAGE_TIMEOUT_UNBIND: { Log.e(TAG, "MESSAGE_TIMEOUT_UNBIND"); |