Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8843804 authored Apr 01, 2022 by Jack He Committed by Automerger Merge Worker Apr 01, 2022

Merge "Fix unregistering callbacks" am: b6a2beb6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2052885

Change-Id: I6796e0935021a0ddead039f26070f0963192264d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 07bf5a61 b6a2beb6

framework/java/android/bluetooth/BluetoothHapClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -601,7 +601,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
		if (DBG) log("unregisterCallback");

		synchronized (mCallbackExecutorMap) {
		if (mCallbackExecutorMap.remove(callback) != null) {
		if (mCallbackExecutorMap.remove(callback) == null) {
		throw new IllegalArgumentException("This callback has not been registered");
		}
		}

framework/java/android/bluetooth/BluetoothLeAudio.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1002,7 +1002,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
		if (DBG) log("unregisterCallback");

		synchronized (mCallbackExecutorMap) {
		if (mCallbackExecutorMap.remove(callback) != null) {
		if (mCallbackExecutorMap.remove(callback) == null) {
		throw new IllegalArgumentException("This callback has not been registered");
		}
		}

framework/java/android/bluetooth/BluetoothLeBroadcast.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
		if (DBG) log("unregisterCallback");

		synchronized (mCallbackExecutorMap) {
		if (mCallbackExecutorMap.remove(callback) != null) {
		if (mCallbackExecutorMap.remove(callback) == null) {
		throw new IllegalArgumentException("This callback has not been registered");
		}
		}