Snap for 11996894 from 661cafd075fe3ec3bcc4f31b82601eda3a5004c6 to 24Q4-release (26ee4cea) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/PhonePolicy.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -887,11 +887,6 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
		return;
		}

		if (!Flags.autoConnectOnHfpWhenNoA2dpDevice()) {
		debugLog("HFP auto connect is not enabled");
		return;
		}

		if (Flags.autoConnectOnMultipleHfpWhenNoA2dpDevice()) {
		final List<BluetoothDevice> mostRecentlyConnectedHfpDevices =
		mDatabaseManager.getMostRecentlyActiveHfpDevices();

+0 −3

Original line number	Diff line number	Diff line
		@@ -1071,7 +1071,6 @@ public class PhonePolicyTest {
		*/
		@Test
		public void testAutoConnectHfpOnly() {
		mSetFlagsRule.enableFlags(Flags.FLAG_AUTO_CONNECT_ON_HFP_WHEN_NO_A2DP_DEVICE);
		mSetFlagsRule.disableFlags(Flags.FLAG_AUTO_CONNECT_ON_MULTIPLE_HFP_WHEN_NO_A2DP_DEVICE);

		// Return desired values from the mocked object(s)
		@@ -1109,7 +1108,6 @@ public class PhonePolicyTest {

		@Test
		public void autoConnect_whenMultiHfp_startConnection() {
		mSetFlagsRule.enableFlags(Flags.FLAG_AUTO_CONNECT_ON_HFP_WHEN_NO_A2DP_DEVICE);
		mSetFlagsRule.enableFlags(Flags.FLAG_AUTO_CONNECT_ON_MULTIPLE_HFP_WHEN_NO_A2DP_DEVICE);

		// Return desired values from the mocked object(s)
		@@ -1154,7 +1152,6 @@ public class PhonePolicyTest {
		@Test
		public void autoConnect_whenMultiHfpAndDeconnection_startConnection() {
		mSetFlagsRule.enableFlags(Flags.FLAG_AUTO_CONNECT_ON_MULTIPLE_HFP_WHEN_NO_A2DP_DEVICE);
		mSetFlagsRule.enableFlags(Flags.FLAG_AUTO_CONNECT_ON_HFP_WHEN_NO_A2DP_DEVICE);

		// Return desired values from the mocked object(s)
		doReturn(BluetoothAdapter.STATE_ON).when(mAdapterService).getState();

+0 −7

Original line number	Diff line number	Diff line
		package: "com.android.bluetooth.flags"
		container: "com.android.btservices"

		flag {
		name: "auto_connect_on_hfp_when_no_a2dp_device"
		namespace: "bluetooth"
		description: "Auto connect to hfp device is there is no a2dp device to connect to"
		bug: "305799237"
		}

		flag {
		name: "auto_connect_on_multiple_hfp_when_no_a2dp_device"
		namespace: "bluetooth"

+10 −0

Original line number	Diff line number	Diff line
		@@ -24,3 +24,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "l2cap_update_existing_conn_interval_with_base_interval"
		namespace: "bluetooth"
		description: "Update existing connection intervals when base ecosystem interval is set"
		bug: "348209161"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

0 → 100644

+3 −0