summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcore/java/android/bluetooth/BluetoothAdapter.java18
-rw-r--r--core/java/android/bluetooth/BluetoothSocket.java2
-rw-r--r--services/java/com/android/server/BluetoothManagerService.java103
3 files changed, 73 insertions, 50 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index 9f50c54..c08705c 100755
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1210,7 +1210,11 @@ public final class BluetoothAdapter {
mService = bluetoothService;
for (IBluetoothManagerCallback cb : mBluetoothManagerCallbackList ){
try {
- cb.onBluetoothServiceUp(bluetoothService);
+ if (cb != null) {
+ cb.onBluetoothServiceUp(bluetoothService);
+ } else {
+ Log.d(TAG, "onBluetoothServiceUp: cb is null!!!");
+ }
} catch (Exception e) { Log.e(TAG,"",e);}
}
}
@@ -1222,7 +1226,11 @@ public final class BluetoothAdapter {
mService = null;
for (IBluetoothManagerCallback cb : mBluetoothManagerCallbackList ){
try {
- cb.onBluetoothServiceDown();
+ if (cb != null) {
+ cb.onBluetoothServiceDown();
+ } else {
+ Log.d(TAG, "onBluetoothServiceDown: cb is null!!!");
+ }
} catch (Exception e) { Log.e(TAG,"",e);}
}
}
@@ -1361,10 +1369,12 @@ public final class BluetoothAdapter {
}
private ArrayList<IBluetoothManagerCallback> mBluetoothManagerCallbackList = new ArrayList<IBluetoothManagerCallback>();
- //private IBluetoothStateChangeCallback mBluetoothStateChangeCallback;
+
/*package*/ IBluetooth getBluetoothService(IBluetoothManagerCallback cb) {
synchronized (mManagerCallback) {
- if (!mBluetoothManagerCallbackList.contains(cb)) {
+ if (cb == null) {
+ Log.w(TAG, "Unable to register null state change callback", new Exception());
+ } else if (!mBluetoothManagerCallbackList.contains(cb)) {
mBluetoothManagerCallbackList.add(cb);
}
}
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index 221b1a3..1bc640f 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -468,7 +468,7 @@ public final class BluetoothSocket implements Closeable {
int left = b.length;
while(left > 0) {
int ret = is.read(b, b.length - left, left);
- if(ret < 0)
+ if(ret <= 0)
throw new IOException("read failed, socket might closed, read ret: " + ret);
left -= ret;
if(left != 0)
diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java
index 56487fe..9610ffc 100644
--- a/services/java/com/android/server/BluetoothManagerService.java
+++ b/services/java/com/android/server/BluetoothManagerService.java
@@ -19,6 +19,7 @@ import android.content.ServiceConnection;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
+import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.provider.Settings;
import android.util.Log;
@@ -61,8 +62,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
private String mAddress;
private String mName;
private ContentResolver mContentResolver;
- private List<IBluetoothManagerCallback> mCallbacks;
- private List<IBluetoothStateChangeCallback> mStateChangeCallbacks;
+ private RemoteCallbackList<IBluetoothManagerCallback> mCallbacks;
+ private RemoteCallbackList<IBluetoothStateChangeCallback> mStateChangeCallbacks;
private IBluetooth mBluetooth;
private boolean mBinding;
private boolean mUnbinding;
@@ -121,8 +122,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mAddress = null;
mName = null;
mContentResolver = context.getContentResolver();
- mCallbacks = new ArrayList<IBluetoothManagerCallback>();
- mStateChangeCallbacks = new ArrayList<IBluetoothStateChangeCallback>();
+ mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();
+ mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();
IntentFilter mFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
mFilter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
registerForAirplaneMode(mFilter);
@@ -333,14 +334,31 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mUnbinding = true;
if (isConnected()) {
if (DBG) Log.d(TAG, "Sending unbind request.");
+ mBluetooth = null;
+ //Unbind
mContext.unbindService(mConnection);
- mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED));
+ mUnbinding = false;
} else {
mUnbinding=false;
}
}
}
+ private void sendBluetoothServiceDownEvent() {
+ if (!mConnection.isGetNameAddressOnly()) {
+ if (DBG) Log.d(TAG,"Calling onBluetoothServiceDown callbacks");
+ int n = mCallbacks.beginBroadcast();
+ Log.d(TAG,"Broadcasting onBluetoothServiceDown() to " + n + " receivers.");
+ for (int i=0; i <n;i++) {
+ try {
+ mCallbacks.getBroadcastItem(i).onBluetoothServiceDown();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to call onBluetoothServiceDown() on callback #" + i, e);
+ }
+ }
+ mCallbacks.finishBroadcast();
+ }
+ }
public String getAddress() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
"Need BLUETOOTH ADMIN permission");
@@ -446,6 +464,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
i.putExtra(EXTRA_ACTION, ACTION_SERVICE_STATE_CHANGED);
i.putExtra(BluetoothAdapter.EXTRA_STATE,BluetoothAdapter.STATE_OFF);
mContext.startService(i);
+ sendBluetoothServiceDownEvent();
unbindAndFinish();
} else {
if (msg.arg1 < MAX_SAVE_RETRIES) {
@@ -455,6 +474,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mHandler.sendMessageDelayed(retryMsg, TIMEOUT_SAVE_MS);
} else {
Log.w(TAG,"Maximum name/address remote retrieval retry exceeded");
+ sendBluetoothServiceDownEvent();
unbindAndFinish();
}
}
@@ -542,25 +562,27 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
case MESSAGE_REGISTER_ADAPTER:
{
IBluetoothManagerCallback callback = (IBluetoothManagerCallback) msg.obj;
- mCallbacks.add(callback);
+ boolean added = mCallbacks.register(callback);
+ Log.d(TAG,"Added callback: " + (callback == null? "null": callback) +":" +added );
}
break;
case MESSAGE_UNREGISTER_ADAPTER:
{
IBluetoothManagerCallback callback = (IBluetoothManagerCallback) msg.obj;
- mCallbacks.remove(callback);
+ boolean removed = mCallbacks.unregister(callback);
+ Log.d(TAG,"Removed callback: " + (callback == null? "null": callback) +":" + removed);
}
break;
case MESSAGE_REGISTER_STATE_CHANGE_CALLBACK:
{
IBluetoothStateChangeCallback callback = (IBluetoothStateChangeCallback) msg.obj;
- mStateChangeCallbacks.add(callback);
+ mStateChangeCallbacks.register(callback);
}
break;
case MESSAGE_UNREGISTER_STATE_CHANGE_CALLBACK:
{
IBluetoothStateChangeCallback callback = (IBluetoothStateChangeCallback) msg.obj;
- mStateChangeCallbacks.remove(callback);
+ mStateChangeCallbacks.unregister(callback);
}
break;
case MESSAGE_BLUETOOTH_SERVICE_CONNECTED:
@@ -582,14 +604,16 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mHandler.sendMessage(getMsg);
return;
}
-
- try {
- for (IBluetoothManagerCallback callback : mCallbacks) {
- callback.onBluetoothServiceUp(mBluetooth);
+ int n = mCallbacks.beginBroadcast();
+ Log.d(TAG,"Broadcasting onBluetoothServiceUp() to " + n + " receivers.");
+ for (int i=0; i <n;i++) {
+ try {
+ mCallbacks.getBroadcastItem(i).onBluetoothServiceUp(mBluetooth);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to call onBluetoothServiceUp() on callback #" + i, e);
+ }
}
- } catch (RemoteException e) {
- Log.e(TAG, "", e);
- }
+ mCallbacks.finishBroadcast();
}
break;
@@ -603,50 +627,39 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
case MESSAGE_BLUETOOTH_ON:
{
if (DBG) Log.d(TAG, "MESSAGE_BLUETOOTH_ON");
- try {
- for (IBluetoothStateChangeCallback callback : mStateChangeCallbacks) {
- callback.onBluetoothStateChange(true);
+ int n = mStateChangeCallbacks.beginBroadcast();
+ Log.d(TAG,"Broadcasting onBluetoothStateChange() to " + n + " receivers.");
+ for (int i=0; i <n;i++) {
+ try {
+ mStateChangeCallbacks.getBroadcastItem(i).onBluetoothStateChange(true);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to call onBluetoothStateChange() on callback #" + i , e);
}
- } catch (RemoteException e) {
- Log.e(TAG, "", e);
}
+ mStateChangeCallbacks.finishBroadcast();
}
break;
case MESSAGE_BLUETOOTH_OFF:
{
if (DBG) Log.d(TAG, "MESSAGE_BLUETOOTH_OFF");
- try {
- for (IBluetoothStateChangeCallback callback : mStateChangeCallbacks) {
- callback.onBluetoothStateChange(false);
+ int n = mStateChangeCallbacks.beginBroadcast();
+ Log.d(TAG,"Broadcasting onBluetoothStateChange() to " + n + " receivers.");
+ for (int i=0; i <n;i++) {
+ try {
+ mStateChangeCallbacks.getBroadcastItem(i).onBluetoothStateChange(false);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to call onBluetoothStateChange() on callback #" + i , e);
}
- } catch (RemoteException e) {
- Log.e(TAG, "", e);
}
+ mStateChangeCallbacks.finishBroadcast();
+ sendBluetoothServiceDownEvent();
unbindAndFinish();
}
break;
case MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED:
{
if (DBG) Log.d(TAG, "MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED");
- boolean isUnexpectedDisconnect = false;
- synchronized(mConnection) {
- mBluetooth = null;
- if (mUnbinding) {
- mUnbinding = false;
- } else {
- isUnexpectedDisconnect = true;
- }
- }
- if (!mConnection.isGetNameAddressOnly()) {
- if (DBG) Log.d(TAG,"MESSAGE_BLUETOOTH_SERVICE_DISCONNECTED: Calling onBluetoothSerivceDown callbacks");
- try {
- for (IBluetoothManagerCallback callback : mCallbacks) {
- callback.onBluetoothServiceDown();
- }
- } catch (RemoteException e) {
- Log.e(TAG, "", e);
- }
- }
+ sendBluetoothServiceDownEvent();
}
break;
case MESSAGE_TIMEOUT_UNBIND:
generated by cgit v1.1 at 2025-02-19 07:18:32 +0000