Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to... (d07368a6) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -464,12 +464,15 @@ public final class BluetoothAdapter {
		synchronized(mManagerCallback) {
		if (mService != null)
		{
		return mService.getState();
		int state= mService.getState();
		if (DBG) Log.d(TAG, "" + hashCode() + ": getState(). Returning " + state);
		return state;
		}
		// TODO(BT) there might be a small gap during STATE_TURNING_ON that
		// mService is null, handle that case
		}
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		if (DBG) Log.d(TAG, "" + hashCode() + ": getState() : mService = null. Returning STATE_OFF");
		return STATE_OFF;
		}

		@@ -1208,7 +1211,7 @@ public final class BluetoothAdapter {
		if (DBG) Log.d(TAG, "onBluetoothServiceUp: " + bluetoothService);
		synchronized (mManagerCallback) {
		mService = bluetoothService;
		for (IBluetoothManagerCallback cb : mBluetoothManagerCallbackList ){
		for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
		try {
		if (cb != null) {
		cb.onBluetoothServiceUp(bluetoothService);
		@@ -1224,7 +1227,7 @@ public final class BluetoothAdapter {
		if (DBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);
		synchronized (mManagerCallback) {
		mService = null;
		for (IBluetoothManagerCallback cb : mBluetoothManagerCallbackList ){
		for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
		try {
		if (cb != null) {
		cb.onBluetoothServiceDown();
		@@ -1368,14 +1371,14 @@ public final class BluetoothAdapter {
		return mManagerService;
		}

		private ArrayList<IBluetoothManagerCallback> mBluetoothManagerCallbackList = new ArrayList<IBluetoothManagerCallback>();
		private ArrayList<IBluetoothManagerCallback> mProxyServiceStateCallbacks = new ArrayList<IBluetoothManagerCallback>();

		/package/ IBluetooth getBluetoothService(IBluetoothManagerCallback cb) {
		synchronized (mManagerCallback) {
		if (cb == null) {
		Log.w(TAG, "Unable to register null state change callback", new Exception());
		} else if (!mBluetoothManagerCallbackList.contains(cb)) {
		mBluetoothManagerCallbackList.add(cb);
		Log.w(TAG, "getBluetoothService() called with no BluetoothManagerCallback");
		} else if (!mProxyServiceStateCallbacks.contains(cb)) {
		mProxyServiceStateCallbacks.add(cb);
		}
		}
		return mService;
		@@ -1383,7 +1386,7 @@ public final class BluetoothAdapter {

		/package/ void removeServiceStateCallback(IBluetoothManagerCallback cb) {
		synchronized (mManagerCallback) {
		mBluetoothManagerCallbackList.remove(cb);
		mProxyServiceStateCallbacks.remove(cb);
		}
		}
		}

framework/java/android/bluetooth/IBluetooth.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,9 @@ interface IBluetooth

		void sendConnectionStateChange(in BluetoothDevice device, int profile, int state, int prevState);

		void registerCallback(in IBluetoothCallback callback);
		void unregisterCallback(in IBluetoothCallback callback);

		// For Socket
		ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag);
		ParcelFileDescriptor createSocketChannel(int type, in String serviceName, in ParcelUuid uuid, int port, int flag);

framework/java/android/bluetooth/IBluetoothCallback.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,5 +23,6 @@ package android.bluetooth;
		*/
		interface IBluetoothCallback
		{
		void onRfcommChannelFound(int channel);
		//void onRfcommChannelFound(int channel);
		void onBluetoothStateChange(int prevState, int newState);
		}