Merge "HeadsetClient: Return from stop() if not started" (c76e2eb1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java

+9 −17

Original line number	Diff line number	Diff line
		@@ -86,12 +86,8 @@ public class HeadsetClientService extends ProfileService {
		mStateMachineMap.clear();

		IntentFilter filter = new IntentFilter(AudioManager.VOLUME_CHANGED_ACTION);
		try {
		registerReceiver(mBroadcastReceiver, filter);
		} catch (Exception e) {
		Log.w(TAG, "Unable to register broadcat receiver", e);
		}
		setHeadsetClientService(this);

		mNativeInterface = new NativeInterface();

		// Start the HfpClientConnectionService to create connection with telecom when HFP
		@@ -103,16 +99,19 @@ public class HeadsetClientService extends ProfileService {
		mSmThread = new HandlerThread("HeadsetClient.SM");
		mSmThread.start();

		setHeadsetClientService(this);
		return true;
		}

		@Override
		protected synchronized boolean stop() {
		try {
		unregisterReceiver(mBroadcastReceiver);
		} catch (Exception e) {
		Log.w(TAG, "Unable to unregister broadcast receiver", e);
		if (sHeadsetClientService == null) {
		Log.w(TAG, "stop() called without start()");
		return false;
		}
		setHeadsetClientService(null);

		unregisterReceiver(mBroadcastReceiver);

		for (Iterator<Map.Entry<BluetoothDevice, HeadsetClientStateMachine>> it =
		mStateMachineMap.entrySet().iterator(); it.hasNext(); ) {
		@@ -137,13 +136,6 @@ public class HeadsetClientService extends ProfileService {
		return true;
		}

		@Override
		protected void cleanup() {
		HeadsetClientStateMachine.cleanup();
		// TODO(b/72948646): should be moved to stop()
		setHeadsetClientService(null);
		}

		private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -758,9 +758,6 @@ public class HeadsetClientStateMachine extends StateMachine {
		quitNow();
		}

		public static void cleanup() {
		}

		static int hfToAmVol(int hfVol) {
		int amRange = sMaxAmVcVol - sMinAmVcVol;
		int hfRange = MAX_HFP_SCO_VOICE_CALL_VOLUME - MIN_HFP_SCO_VOICE_CALL_VOLUME;