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

Commit 071cf994 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

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

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

parents c3b59e85 df82eeeb

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);