Merge "Adapter: use callback wrapper for bt connection" into main (f09387b5) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+37 −77

Original line number	Diff line number	Diff line
		@@ -889,8 +889,6 @@ public final class BluetoothAdapter {
		private final Map<LeScanCallback, ScanCallback> mLeScanClients = new HashMap<>();
		private final Map<BluetoothDevice, List<Pair<OnMetadataChangedListener, Executor>>>
		mMetadataListeners = new HashMap<>();
		private final Map<BluetoothConnectionCallback, Executor>
		mBluetoothConnectionCallbackExecutorMap = new HashMap<>();

		private static final class ProfileConnection {
		int mProfile;
		@@ -1150,6 +1148,28 @@ public final class BluetoothAdapter {
		new CallbackWrapper(
		registerAudioProfilesCallbackConsumer,
		unregisterAudioProfilesCallbackConsumer);
		Consumer<IBluetooth> registerBluetoothConnectionCallbackConsumer =
		(IBluetooth service) -> {
		try {
		service.registerBluetoothConnectionCallback(
		mBluetoothConnectionCallback, mAttributionSource);
		} catch (RemoteException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		};
		Consumer<IBluetooth> unregisterBluetoothConnectionCallbackConsumer =
		(IBluetooth service) -> {
		try {
		service.registerBluetoothConnectionCallback(
		mBluetoothConnectionCallback, mAttributionSource);
		} catch (RemoteException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		};
		mBluetoothConnectionCallbackWrapper =
		new CallbackWrapper(
		registerBluetoothConnectionCallbackConsumer,
		unregisterBluetoothConnectionCallbackConsumer);
		}

		/**
		@@ -3793,10 +3813,10 @@ public final class BluetoothAdapter {
		}
		mAudioProfilesCallbackWrapper.registerToNewService(mService);
		mQualityCallbackWrapper.registerToNewService(mService);
		mBluetoothConnectionCallbackWrapper.registerToNewService(mService);
		} finally {
		mServiceLock.readLock().unlock();
		}
		registerBluetoothConnectionCallbackIfNeeded();
		}

		public void onBluetoothServiceDown() {
		@@ -4651,29 +4671,23 @@ public final class BluetoothAdapter {
		void onMetadataChanged(@NonNull BluetoothDevice device, int key, @Nullable byte[] value);
		}

		@SuppressLint("AndroidFrameworkBluetoothPermission")
		private final CallbackWrapper<BluetoothConnectionCallback, IBluetooth>
		mBluetoothConnectionCallbackWrapper;

		private final IBluetoothConnectionCallback mBluetoothConnectionCallback =
		new IBluetoothConnectionCallback.Stub() {
		@Override
		public void onDeviceConnected(BluetoothDevice device) {
		Attributable.setAttributionSource(device, mAttributionSource);
		for (Map.Entry<BluetoothConnectionCallback, Executor> callbackExecutorEntry :
		mBluetoothConnectionCallbackExecutorMap.entrySet()) {
		BluetoothConnectionCallback callback = callbackExecutorEntry.getKey();
		Executor executor = callbackExecutorEntry.getValue();
		executor.execute(() -> callback.onDeviceConnected(device));
		}
		mBluetoothConnectionCallbackWrapper.forEach(
		(cb) -> cb.onDeviceConnected(device));
		}

		@Override
		public void onDeviceDisconnected(BluetoothDevice device, int hciReason) {
		Attributable.setAttributionSource(device, mAttributionSource);
		for (Map.Entry<BluetoothConnectionCallback, Executor> callbackExecutorEntry :
		mBluetoothConnectionCallbackExecutorMap.entrySet()) {
		BluetoothConnectionCallback callback = callbackExecutorEntry.getKey();
		Executor executor = callbackExecutorEntry.getValue();
		executor.execute(() -> callback.onDeviceDisconnected(device, hciReason));
		}
		mBluetoothConnectionCallbackWrapper.forEach(
		(cb) -> cb.onDeviceDisconnected(device, hciReason));
		}
		};

		@@ -4698,47 +4712,15 @@ public final class BluetoothAdapter {
		@NonNull @CallbackExecutor Executor executor,
		@NonNull BluetoothConnectionCallback callback) {
		if (DBG) Log.d(TAG, "registerBluetoothConnectionCallback()");
		if (callback == null \|\| executor == null) {
		return false;
		}

		synchronized (mBluetoothConnectionCallbackExecutorMap) {
		if (mBluetoothConnectionCallbackExecutorMap.containsKey(callback)) {
		throw new IllegalArgumentException("This callback has already been registered");
		}

		if (mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
		registerBluetoothConnectionCallback();
		}

		mBluetoothConnectionCallbackExecutorMap.put(callback, executor);
		}

		return true;
		}

		private void registerBluetoothConnectionCallback() {
		mServiceLock.readLock().lock();
		try {
		if (mService == null) {
		return;
		}
		mService.registerBluetoothConnectionCallback(
		mBluetoothConnectionCallback, mAttributionSource);
		} catch (RemoteException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		mBluetoothConnectionCallbackWrapper.registerCallback(mService, callback, executor);
		} finally {
		mServiceLock.readLock().unlock();
		}
		}

		private void registerBluetoothConnectionCallbackIfNeeded() {
		synchronized (mBluetoothConnectionCallbackExecutorMap) {
		if (mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
		return;
		}
		registerBluetoothConnectionCallback();
		}
		return true;
		}

		/**
		@@ -4758,34 +4740,12 @@ public final class BluetoothAdapter {
		public boolean unregisterBluetoothConnectionCallback(
		@NonNull BluetoothConnectionCallback callback) {
		if (DBG) Log.d(TAG, "unregisterBluetoothConnectionCallback()");
		if (callback == null) {
		return false;
		}

		synchronized (mBluetoothConnectionCallbackExecutorMap) {
		if (!mBluetoothConnectionCallbackExecutorMap.containsKey(callback)) {
		return true;
		}

		mBluetoothConnectionCallbackExecutorMap.remove(callback);

		if (mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
		// If the callback map is empty, we unregister the service-to-app callback
		mServiceLock.readLock().lock();
		try {
		if (mService == null) {
		return true;
		}
		mService.unregisterBluetoothConnectionCallback(
		mBluetoothConnectionCallback, mAttributionSource);
		} catch (RemoteException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		mBluetoothConnectionCallbackWrapper.unregisterCallback(mService, callback);
		} finally {
		mServiceLock.readLock().unlock();
		}
		}
		}

		return true;
		}