PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove rolled out flag automatic_bt_device_type" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-05 23:25:39 -08:00
committed by Android (Google) Code Review
parent 88548e94cb b136fcfe18
commit b8958a73b5
2 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
View File

@@ -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));
}
mAudioManager.setBluetoothAudioDeviceCategory(
mCachedDevice.getAddress(), 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(
mCachedDevice.getAddress());
} else {
deviceCategory = mAudioManager.getBluetoothAudioDeviceCategory_legacy(
mCachedDevice.getAddress(),
mCachedDevice.getDevice().getType() == DEVICE_TYPE_LE);
}
@AudioDeviceCategory int deviceCategory = mAudioManager.getBluetoothAudioDeviceCategory(
mCachedDevice.getAddress());
if (DEBUG) {
Log.v(TAG, "getBluetoothAudioDeviceCategory() device: "
+ mCachedDevice.getDevice().getAnonymizedAddress()
@@ -190,10 +174,8 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
}
mAudioDeviceTypePreference.setValue(Integer.toString(deviceCategory));
if (automaticBtDeviceType()) {
if (mAudioManager.isBluetoothAudioDeviceCategoryFixed(mCachedDevice.getAddress())) {
mAudioDeviceTypePreference.setEnabled(false);
}
if (mAudioManager.isBluetoothAudioDeviceCategoryFixed(mCachedDevice.getAddress())) {
mAudioDeviceTypePreference.setEnabled(false);
}
mAudioDeviceTypePreference.setSummary(mAudioDeviceTypePreference.getEntry());

17
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeControllerTest.java
View File

@@ -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);
}
when(mAudioManager.getBluetoothAudioDeviceCategory(MAC_ADDRESS)).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));
}
verify(mAudioManager).setBluetoothAudioDeviceCategory(eq(MAC_ADDRESS),
eq(AUDIO_DEVICE_CATEGORY_SPEAKER));
}
}