Merge "Redesign HFP Client call handling" (f5f73e1d) · Commits · e / os / android_packages_modules_Bluetooth

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

+15 −55

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import com.android.bluetooth.Utils;

		import java.util.ArrayList;
		import java.util.List;

		import java.util.UUID;

		/**
		* Provides Bluetooth Headset Client (HF Role) profile, as a service in the
		@@ -342,12 +342,12 @@ public class HeadsetClientService extends ProfileService {
		}

		@Override
		public boolean terminateCall(BluetoothDevice device, int index) {
		public boolean terminateCall(BluetoothDevice device, BluetoothHeadsetClientCall call) {
		HeadsetClientService service = getService();
		if (service == null) {
		return false;
		}
		return service.terminateCall(device, index);
		return service.terminateCall(device, call.getUUID());
		}

		@Override
		@@ -369,32 +369,14 @@ public class HeadsetClientService extends ProfileService {
		}

		@Override
		public boolean redial(BluetoothDevice device) {
		public BluetoothHeadsetClientCall dial(BluetoothDevice device, String number) {
		HeadsetClientService service = getService();
		if (service == null) {
		return false;
		}
		return service.redial(device);
		}

		@Override
		public boolean dial(BluetoothDevice device, String number) {
		HeadsetClientService service = getService();
		if (service == null) {
		return false;
		return null;
		}
		return service.dial(device, number);
		}

		@Override
		public boolean dialMemory(BluetoothDevice device, int location) {
		HeadsetClientService service = getService();
		if (service == null) {
		return false;
		}
		return service.dialMemory(device, location);
		}

		@Override
		public List<BluetoothHeadsetClientCall> getCurrentCalls(BluetoothDevice device) {
		HeadsetClientService service = getService();
		@@ -654,7 +636,7 @@ public class HeadsetClientService extends ProfileService {
		return true;
		}

		boolean terminateCall(BluetoothDevice device, int index) {
		boolean terminateCall(BluetoothDevice device, UUID uuid) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		int connectionState = mStateMachine.getConnectionState(device);
		if (connectionState != BluetoothProfile.STATE_CONNECTED &&
		@@ -663,7 +645,7 @@ public class HeadsetClientService extends ProfileService {
		}

		Message msg = mStateMachine.obtainMessage(HeadsetClientStateMachine.TERMINATE_CALL);
		msg.arg1 = index;
		msg.obj = uuid;
		mStateMachine.sendMessage(msg);
		return true;
		}
		@@ -682,44 +664,22 @@ public class HeadsetClientService extends ProfileService {
		return true;
		}

		boolean redial(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		int connectionState = mStateMachine.getConnectionState(device);
		if (connectionState != BluetoothProfile.STATE_CONNECTED &&
		connectionState != BluetoothProfile.STATE_CONNECTING) {
		return false;
		}

		Message msg = mStateMachine.obtainMessage(HeadsetClientStateMachine.REDIAL);
		mStateMachine.sendMessage(msg);
		return true;
		}

		boolean dial(BluetoothDevice device, String number) {
		BluetoothHeadsetClientCall dial(BluetoothDevice device, String number) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		int connectionState = mStateMachine.getConnectionState(device);
		if (connectionState != BluetoothProfile.STATE_CONNECTED &&
		connectionState != BluetoothProfile.STATE_CONNECTING) {
		return false;
		return null;
		}

		BluetoothHeadsetClientCall call = new BluetoothHeadsetClientCall(
		device, HeadsetClientStateMachine.HF_ORIGINATED_CALL_ID,
		BluetoothHeadsetClientCall.CALL_STATE_DIALING, number, false /* multiparty */,
		true /* outgoing */);
		Message msg = mStateMachine.obtainMessage(HeadsetClientStateMachine.DIAL_NUMBER);
		msg.obj = number;
		msg.obj = call;
		mStateMachine.sendMessage(msg);
		return true;
		}

		boolean dialMemory(BluetoothDevice device, int location) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		int connectionState = mStateMachine.getConnectionState(device);
		if (connectionState != BluetoothProfile.STATE_CONNECTED &&
		connectionState != BluetoothProfile.STATE_CONNECTING) {
		return false;
		}
		Message msg = mStateMachine.obtainMessage(HeadsetClientStateMachine.DIAL_MEMORY);
		msg.arg1 = location;
		mStateMachine.sendMessage(msg);
		return true;
		return call;
		}

		public boolean sendDTMF(BluetoothDevice device, byte code) {