MAP: Add developer option to control map version
Bug: 146916756 Test: manual Change-Id: If32db03072e02b7b2477c7da943b6b0e6a9be260
This commit is contained in:
@@ -303,6 +303,13 @@
|
|||||||
android:entries="@array/bluetooth_avrcp_versions"
|
android:entries="@array/bluetooth_avrcp_versions"
|
||||||
android:entryValues="@array/bluetooth_avrcp_version_values" />
|
android:entryValues="@array/bluetooth_avrcp_version_values" />
|
||||||
|
|
||||||
|
<ListPreference
|
||||||
|
android:key="bluetooth_select_map_version"
|
||||||
|
android:title="@string/bluetooth_select_map_version_string"
|
||||||
|
android:dialogTitle="@string/bluetooth_select_map_version_dialog_title"
|
||||||
|
android:entries="@array/bluetooth_map_versions"
|
||||||
|
android:entryValues="@array/bluetooth_map_version_values" />
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="bluetooth_hd_audio_settings"
|
android:key="bluetooth_hd_audio_settings"
|
||||||
android:title="@string/bluetooth_profile_a2dp_high_quality_unknown_codec"/>
|
android:title="@string/bluetooth_profile_a2dp_high_quality_unknown_codec"/>
|
||||||
|
@@ -0,0 +1,79 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference controller to control Bluetooth MAP version
|
||||||
|
*/
|
||||||
|
public class BluetoothMapVersionPreferenceController extends DeveloperOptionsPreferenceController
|
||||||
|
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
|
||||||
|
|
||||||
|
private static final String BLUETOOTH_SELECT_MAP_VERSION_KEY =
|
||||||
|
"bluetooth_select_map_version";
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
static final String BLUETOOTH_MAP_VERSION_PROPERTY = "persist.bluetooth.mapversion";
|
||||||
|
|
||||||
|
private final String[] mListValues;
|
||||||
|
private final String[] mListSummaries;
|
||||||
|
|
||||||
|
public BluetoothMapVersionPreferenceController(Context context) {
|
||||||
|
super(context);
|
||||||
|
|
||||||
|
mListValues = context.getResources().getStringArray(R.array.bluetooth_map_version_values);
|
||||||
|
mListSummaries = context.getResources().getStringArray(R.array.bluetooth_map_versions);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return BLUETOOTH_SELECT_MAP_VERSION_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
SystemProperties.set(BLUETOOTH_MAP_VERSION_PROPERTY, newValue.toString());
|
||||||
|
updateState(mPreference);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
final ListPreference listPreference = (ListPreference) preference;
|
||||||
|
final String currentValue = SystemProperties.get(BLUETOOTH_MAP_VERSION_PROPERTY);
|
||||||
|
int index = 0; // Defaults to MAP 1.2
|
||||||
|
for (int i = 0; i < mListValues.length; i++) {
|
||||||
|
if (TextUtils.equals(currentValue, mListValues[i])) {
|
||||||
|
index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
listPreference.setValue(mListValues[index]);
|
||||||
|
listPreference.setSummary(mListSummaries[index]);
|
||||||
|
}
|
||||||
|
}
|
@@ -465,6 +465,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
|
controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
|
||||||
controllers.add(new BluetoothGabeldorschePreferenceController(context));
|
controllers.add(new BluetoothGabeldorschePreferenceController(context));
|
||||||
controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
|
controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
|
||||||
|
controllers.add(new BluetoothMapVersionPreferenceController(context));
|
||||||
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
||||||
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
||||||
controllers.add(new ShowTapsPreferenceController(context));
|
controllers.add(new ShowTapsPreferenceController(context));
|
||||||
|
@@ -0,0 +1,108 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package com.android.settings.development;
|
||||||
|
import static com.android.settings.development.BluetoothMapVersionPreferenceController
|
||||||
|
.BLUETOOTH_MAP_VERSION_PROPERTY;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class BluetoothMapVersionPreferenceControllerTest {
|
||||||
|
@Mock
|
||||||
|
private ListPreference mPreference;
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
private Context mContext;
|
||||||
|
private BluetoothMapVersionPreferenceController mController;
|
||||||
|
/**
|
||||||
|
* 0: MAP 1.2 (Default)
|
||||||
|
* 1: MAP 1.3
|
||||||
|
* 2: MAP 1.4
|
||||||
|
*/
|
||||||
|
private String[] mListValues;
|
||||||
|
private String[] mListSummaries;
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
final Resources resources = mContext.getResources();
|
||||||
|
mListValues = resources.getStringArray(R.array.bluetooth_map_version_values);
|
||||||
|
mListSummaries = resources.getStringArray(R.array.bluetooth_map_versions);
|
||||||
|
mController = new BluetoothMapVersionPreferenceController(mContext);
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
|
.thenReturn(mPreference);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_setMap13_shouldEnableMap13() {
|
||||||
|
mController.onPreferenceChange(mPreference, mListValues[1]);
|
||||||
|
|
||||||
|
final String currentValue = SystemProperties.get(BLUETOOTH_MAP_VERSION_PROPERTY);
|
||||||
|
assertThat(currentValue).isEqualTo(mListValues[1]);
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_setMap14_shouldEnableMap14() {
|
||||||
|
mController.onPreferenceChange(mPreference, mListValues[2]);
|
||||||
|
|
||||||
|
final String currentValue = SystemProperties.get(BLUETOOTH_MAP_VERSION_PROPERTY);
|
||||||
|
assertThat(currentValue).isEqualTo(mListValues[2]);
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
public void updateState_setMap13_shouldSetPreferenceToMap13() {
|
||||||
|
SystemProperties.set(BLUETOOTH_MAP_VERSION_PROPERTY, mListValues[1]);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[1]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[1]);
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
public void updateState_setMap14_shouldSetPreferenceToMap14() {
|
||||||
|
SystemProperties.set(BLUETOOTH_MAP_VERSION_PROPERTY, mListValues[2]);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[2]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[2]);
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
public void updateState_noValueSet_shouldSetDefaultToMap12() {
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[0]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[0]);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user