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

Commit 8af9af99 authored Sep 05, 2023 by Jakub Tyszkowski

Fix calling method on the stopped service

Since the callback was scheduled on the main loop, the service can be
stopped after that and before the callback is called. We should check
if the service is still running before we execute the scheduled callback
logic.

Bug: 298898621
Test: atest BluetoothInstrumentationTests
Change-Id: Id7c9fa75758a13aea93d2d235feb99bfc4cda85c

parent 7f7d8d59

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
		@@ -1078,6 +1078,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);