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

Merge "Bluetooth Codec Settings: Assure flag enabled" into main am: 52038eb6f2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3024725

Change-Id: If1709e6ddf9f805ec263833f6f0f5902fa9d7677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jakub Rotkiewicz
2024-04-16 07:58:54 +00:00
committed by Automerger Merge Worker
parent aee6cfe1c2 52038eb6f2
commit 0ea966fa43
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/development/bluetooth/BluetoothCodecListPreferenceController.java
View File

@@ -78,6 +78,10 @@ public class BluetoothCodecListPreferenceController
@Override
public boolean onPreferenceChange(@Nullable Preference preference, @NonNull Object newValue) {
if (!Flags.a2dpOffloadCodecExtensibilitySettings()) {
return false;
}
if (DEBUG) {
Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);
}
@@ -120,6 +124,10 @@ public class BluetoothCodecListPreferenceController
@Override
public void updateState(@Nullable Preference preference) {
super.updateState(preference);
if (!Flags.a2dpOffloadCodecExtensibilitySettings()) {
return;
}
final List<String> codecIds = new ArrayList<>();
final List<String> labels = new ArrayList<>();
String selectedCodecId = mDefaultValue;

4
tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecListPreferenceControllerTest.java
View File

@@ -35,12 +35,14 @@ import android.bluetooth.BluetoothCodecType;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.platform.test.annotations.RequiresFlagsEnabled;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
import com.android.settings.development.BluetoothA2dpConfigStore;
import com.android.settings.development.Flags;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -57,7 +59,6 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class BluetoothCodecListPreferenceControllerTest {
private static final String DEVICE_ADDRESS = "00:11:22:33:44:55";
@Mock private BluetoothA2dp mBluetoothA2dp;
@@ -245,6 +246,7 @@ public class BluetoothCodecListPreferenceControllerTest {
}
@Test
@RequiresFlagsEnabled(Flags.FLAG_A2DP_OFFLOAD_CODEC_EXTENSIBILITY_SETTINGS)
public void onPreferenceChange_notifyPreference() {
assertFalse(
mController.onPreferenceChange(