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

Commit 9db93eab authored Sep 06, 2023 by Jakub Tyszkowski Committed by Automerger Merge Worker Sep 06, 2023

Merge "Fix calling method on the stopped service" into main am: df82eeeb am: 071cf994

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

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

parents a2c6a74a 071cf994

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1253,6 +1253,11 @@ public class A2dpService extends ProfileService {
		}

		void connectionStateChanged(BluetoothDevice device, int fromState, int toState) {
		if (!isAvailable()) {
		Log.w(TAG, "connectionStateChanged: service is not available");
		return;
		}

		if ((device == null) \|\| (fromState == toState)) {
		return;
		}

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -677,6 +677,11 @@ public class BassClientService extends ProfileService {

		synchronized void connectionStateChanged(BluetoothDevice device, int fromState,
		int toState) {
		if (!isAvailable()) {
		Log.w(TAG, "connectionStateChanged: service is not available");
		return;
		}

		if ((device == null) \|\| (fromState == toState)) {
		Log.e(TAG, "connectionStateChanged: unexpected invocation. device=" + device
		+ " fromState=" + fromState + " toState=" + toState);

android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1022,6 +1022,11 @@ public class CsipSetCoordinatorService extends ProfileService {

		@VisibleForTesting
		synchronized void connectionStateChanged(BluetoothDevice device, int fromState, int toState) {
		if (!isAvailable()) {
		Log.w(TAG, "connectionStateChanged: service is not available");
		return;
		}

		if ((device == null) \|\| (fromState == toState)) {
		Log.e(TAG,
		"connectionStateChanged: unexpected invocation. device=" + device

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1099,6 +1099,11 @@ public class VolumeControlService extends ProfileService {
		@VisibleForTesting
		synchronized void connectionStateChanged(BluetoothDevice device, int fromState,
		int toState) {
		if (!isAvailable()) {
		Log.w(TAG, "connectionStateChanged: service is not available");
		return;
		}

		if ((device == null) \|\| (fromState == toState)) {
		Log.e(TAG, "connectionStateChanged: unexpected invocation. device=" + device
		+ " fromState=" + fromState + " toState=" + toState);