Merge "Floss: Add Three-way call support" into main (bda0dde4) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_hf.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -166,8 +166,8 @@ static uint32_t get_hf_features() {
		DEFAULT_BTIF_HF_FEATURES);
		return hf_features;
		#elif TARGET_FLOSS
		return BTA_AG_FEAT_ECS \| BTA_AG_FEAT_CODEC \| BTA_AG_FEAT_UNAT \|
		BTA_AG_FEAT_HF_IND;
		return BTA_AG_FEAT_3WAY \| BTA_AG_FEAT_ECS \| BTA_AG_FEAT_CODEC \|
		BTA_AG_FEAT_UNAT \| BTA_AG_FEAT_HF_IND;
		#else
		return DEFAULT_BTIF_HF_FEATURES;
		#endif

system/gd/rust/linux/stack/src/bluetooth_media.rs

+59 −30

Original line number	Diff line number	Diff line
		@@ -1051,6 +1051,7 @@ impl BluetoothMedia {
		if success {
		// Success means the call state has changed. Inform libbluetooth.
		self.phone_state_change("".into());
		self.uhid_send_input_report(&addr);
		} else {
		warn!(
		"[{}]: Unexpected or unsupported CHLD command {:?} from HF",
		@@ -2043,25 +2044,38 @@ impl BluetoothMedia {
		}

		fn release_held_impl(&mut self) -> bool {
		if !(self.phone_ops_enabled \|\| self.mps_qualification_enabled)
		\|\| self.phone_state.state != CallState::Idle
		{
		if !(self.phone_ops_enabled \|\| self.mps_qualification_enabled) {
		return false;
		}

		if self.mps_qualification_enabled {
		if self.phone_state.state != CallState::Idle {
		return false;
		}
		self.call_list.retain(\|x\| x.state != CallState::Held);
		self.phone_state.num_held = 0;
		} else if self.phone_ops_enabled {
		if self.phone_state.state == CallState::Incoming {
		self.call_list.retain(\|x\| x.state != CallState::Incoming);
		self.phone_state.state = CallState::Idle;
		} else {
		return false;
		}
		}
		true
		}

		fn release_active_accept_held_impl(&mut self) -> bool {
		if !(self.phone_ops_enabled \|\| self.mps_qualification_enabled)
		\|\| self.phone_state.state != CallState::Idle
		{
		if !(self.phone_ops_enabled \|\| self.mps_qualification_enabled) {
		return false;
		}
		self.call_list.retain(\|x\| x.state != CallState::Active);
		self.phone_state.num_active = 0;
		// Activate the first held call
		if self.mps_qualification_enabled {
		if self.phone_state.state != CallState::Idle {
		return false;
		}
		for c in self.call_list.iter_mut() {
		if c.state == CallState::Held {
		c.state = CallState::Active;
		@@ -2070,16 +2084,28 @@ impl BluetoothMedia {
		break;
		}
		}
		} else if self.phone_ops_enabled {
		for c in self.call_list.iter_mut() {
		if c.state == CallState::Incoming && self.phone_state.state == CallState::Incoming {
		c.state = CallState::Active;
		self.phone_state.num_active += 1;
		self.phone_state.state = CallState::Idle;
		break;
		}
		}
		}
		true
		}

		fn hold_active_accept_held_impl(&mut self) -> bool {
		if !(self.phone_ops_enabled \|\| self.mps_qualification_enabled)
		\|\| self.phone_state.state != CallState::Idle
		{
		if !(self.phone_ops_enabled \|\| self.mps_qualification_enabled) {
		return false;
		}

		if self.mps_qualification_enabled {
		if self.phone_state.state != CallState::Idle {
		return false;
		}
		self.phone_state.num_held += self.phone_state.num_active;
		self.phone_state.num_active = 0;

		@@ -2097,6 +2123,9 @@ impl BluetoothMedia {
		_ => {}
		}
		}
		} else if self.phone_ops_enabled {
		return false;
		}
		true
		}