Merge "Remove rolled out flag automatic_bt_device_type" into main (b8958a73) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java

+6 −24

Original line number	Diff line number	Diff line
		@@ -16,14 +16,12 @@

		package com.android.settings.bluetooth;

		import static android.bluetooth.BluetoothDevice.DEVICE_TYPE_LE;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_CARKIT;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_HEADPHONES;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_HEARING_AID;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_OTHER;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_SPEAKER;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_UNKNOWN;
		import static android.media.audio.Flags.automaticBtDeviceType;

		import android.content.Context;
		import android.media.AudioManager;
		@@ -108,15 +106,8 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
		final int index = pref.findIndexOfValue(value);
		if (index >= 0) {
		pref.setSummary(pref.getEntries()[index]);
		if (automaticBtDeviceType()) {
		mAudioManager.setBluetoothAudioDeviceCategory(
		mCachedDevice.getAddress(), Integer.parseInt(value));
		} else {
		mAudioManager.setBluetoothAudioDeviceCategory_legacy(
		mCachedDevice.getAddress(),
		mCachedDevice.getDevice().getType() == DEVICE_TYPE_LE,
		Integer.parseInt(value));
		}
		mCachedDevice.onAudioDeviceCategoryChanged();
		}
		}
		@@ -174,15 +165,8 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
		Integer.toString(AUDIO_DEVICE_CATEGORY_OTHER),
		});

		@AudioDeviceCategory int deviceCategory;
		if (automaticBtDeviceType()) {
		deviceCategory = mAudioManager.getBluetoothAudioDeviceCategory(
		@AudioDeviceCategory int deviceCategory = mAudioManager.getBluetoothAudioDeviceCategory(
		mCachedDevice.getAddress());
		} else {
		deviceCategory = mAudioManager.getBluetoothAudioDeviceCategory_legacy(
		mCachedDevice.getAddress(),
		mCachedDevice.getDevice().getType() == DEVICE_TYPE_LE);
		}
		if (DEBUG) {
		Log.v(TAG, "getBluetoothAudioDeviceCategory() device: "
		+ mCachedDevice.getDevice().getAnonymizedAddress()
		@@ -190,11 +174,9 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
		}
		mAudioDeviceTypePreference.setValue(Integer.toString(deviceCategory));

		if (automaticBtDeviceType()) {
		if (mAudioManager.isBluetoothAudioDeviceCategoryFixed(mCachedDevice.getAddress())) {
		mAudioDeviceTypePreference.setEnabled(false);
		}
		}

		mAudioDeviceTypePreference.setSummary(mAudioDeviceTypePreference.getEntry());
		mAudioDeviceTypePreference.setOnPreferenceChangeListener(this);

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeControllerTest.java

+3 −14

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.settings.bluetooth;

		import static android.bluetooth.BluetoothDevice.DEVICE_TYPE_LE;
		import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_SPEAKER;
		import static android.media.audio.Flags.automaticBtDeviceType;

		import static com.google.common.truth.Truth.assertThat;

		@@ -98,12 +97,7 @@ public class BluetoothDetailsAudioDeviceTypeControllerTest extends
		@Test
		public void createAudioDeviceTypePreference_btDeviceIsCategorized_checkSelection() {
		int deviceType = AUDIO_DEVICE_CATEGORY_SPEAKER;
		if (automaticBtDeviceType()) {
		when(mAudioManager.getBluetoothAudioDeviceCategory(MAC_ADDRESS)).thenReturn(deviceType);
		} else {
		when(mAudioManager.getBluetoothAudioDeviceCategory_legacy(MAC_ADDRESS, /isBle=/
		true)).thenReturn(deviceType);
		}

		mController.createAudioDeviceTypePreference(mContext);
		mAudioDeviceTypePref = mController.getAudioDeviceTypePreference();
		@@ -118,12 +112,7 @@ public class BluetoothDetailsAudioDeviceTypeControllerTest extends

		mController.onPreferenceChange(mAudioDeviceTypePref, Integer.toString(deviceType));

		if (automaticBtDeviceType()) {
		verify(mAudioManager).setBluetoothAudioDeviceCategory(eq(MAC_ADDRESS),
		eq(AUDIO_DEVICE_CATEGORY_SPEAKER));
		} else {
		verify(mAudioManager).setBluetoothAudioDeviceCategory_legacy(eq(MAC_ADDRESS), eq(true),
		eq(AUDIO_DEVICE_CATEGORY_SPEAKER));
		}
		}
		}