Merge "CsipSetCoordinatorService: Fix possible null ptr dereference" into main (05e84282) · Commits · e / os / android_packages_modules_Bluetooth

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -911,6 +911,16 @@ public class CsipSetCoordinatorService extends ProfileService {

		/** Process a change in the bonding state for a device */
		public void handleBondStateChanged(BluetoothDevice device, int fromState, int toState) {
		if (mHandler == null) {
		Log.e(
		TAG,
		"mHandler is null, service is stopped. Ignore Bond State for "
		+ device
		+ " to state: "
		+ toState);
		return;
		}

		mHandler.post(() -> bondStateChanged(device, toState));
		}

		@@ -972,6 +982,15 @@ public class CsipSetCoordinatorService extends ProfileService {
		}

		void handleConnectionStateChanged(BluetoothDevice device, int fromState, int toState) {
		if (mHandler == null) {
		Log.e(
		TAG,
		"mHandler is null, service is stopped. Ignore Connection State for "
		+ device
		+ " to state: "
		+ toState);
		return;
		}
		mHandler.post(() -> connectionStateChanged(device, fromState, toState));
		}