Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a168d0 authored by Hansong Zhang's avatar Hansong Zhang Committed by Myles Watson
Browse files

Add developer menu entry to enable Bluetooth AVDTP delay reports 

Bug: 32755225
Test: Manual test with a device that supports delay reporting;
Robolectric tests
Change-Id: I8f121dd7f94bce3a07deb9cb23c698829cbecd96
parent 87a17d01

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1655,10 +1655,15 @@ 
    <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->

    <string name="bluetooth_dock_settings_remember">Remember settings</string>









    <!-- Bluetooth developer options. -->









    <!-- Bluetooth developer settings: Maximum number of connected audio devices -->









    <string name="bluetooth_max_connected_audio_devices_string">Maximum connected Bluetooth audio devices</string>









    <!-- Bluetooth developer settings: Maximum number of connected audio devices -->









    <string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>









    <!-- Bluetooth developer settings: Checkbox title for enabling Bluetooth receiving AVDTP delay reports -->









    <string name="bluetooth_enable_avdtp_delay_reports">Enable Bluetooth AVDTP delay reports</string>









    <!-- Bluetooth developer settings: Summary of checkbox for enabling Bluetooth receiving AVDTP delay reports -->









    <string name="bluetooth_enable_avdtp_delay_reports_summary">Allow receiving Bluetooth AVDTP delay reports</string>

















    <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->









    <string name="wifi_display_settings_title">Cast</string>
































res/xml/development_settings.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -256,6 +256,11 @@







            android:title="@string/bluetooth_disable_inband_ringing"









            android:summary="@string/bluetooth_disable_inband_ringing_summary" />



















        <SwitchPreference









            android:key="bluetooth_enable_avdtp_delay_reports"









            android:title="@string/bluetooth_enable_avdtp_delay_reports"









            android:summary="@string/bluetooth_enable_avdtp_delay_reports_summary"/>



















        <ListPreference









            android:key="bluetooth_select_avrcp_version"









            android:title="@string/bluetooth_select_avrcp_version_string"
































src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java
0 → 100644



+85
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2018 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.support.annotation.VisibleForTesting;









import android.support.v14.preference.SwitchPreference;









import android.support.v7.preference.Preference;









import android.support.v7.preference.PreferenceScreen;



















import com.android.settings.core.PreferenceControllerMixin;









import com.android.settingslib.development.DeveloperOptionsPreferenceController;



















public class BluetoothDelayReportsPreferenceController extends









        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,









        PreferenceControllerMixin {



















    private static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORT_KEY =









            "bluetooth_enable_avdtp_delay_reports";









    @VisibleForTesting









    static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY =









            "persist.bluetooth.enabledelayreports";



















    private SwitchPreference mPreference;



















    public BluetoothDelayReportsPreferenceController(Context context) {









        super(context);









    }



















    @Override









    public String getPreferenceKey() {









        return BLUETOOTH_ENABLE_AVDTP_DELAY_REPORT_KEY;









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);



















        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());









    }



















    @Override









    public boolean onPreferenceChange(Preference preference, Object newValue) {









        final boolean isEnabled = (Boolean) newValue;









        SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,









                isEnabled ? "true" : "false");









        return true;









    }



















    @Override









    public void updateState(Preference preference) {









        final boolean isEnabled = SystemProperties.getBoolean(









                BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);









        mPreference.setChecked(isEnabled);









    }



















    @Override









    protected void onDeveloperOptionsSwitchEnabled() {









        mPreference.setEnabled(true);









    }



















    @Override









    protected void onDeveloperOptionsSwitchDisabled() {









        mPreference.setEnabled(false);









        // the default setting for this preference is the disabled state









        mPreference.setChecked(false);









        SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, "false");









    }



















}
























src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -404,6 +404,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







        controllers.add(new BluetoothDeviceNoNamePreferenceController(context));









        controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));









        controllers.add(new BluetoothInbandRingingPreferenceController(context));









        controllers.add(new BluetoothDelayReportsPreferenceController(context));









        controllers.add(new BluetoothAvrcpVersionPreferenceController(context));









        controllers.add(new BluetoothAudioCodecPreferenceController(context, lifecycle,









                bluetoothA2dpConfigStore));
































tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
0 → 100644



+129
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2018 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.BluetoothDelayReportsPreferenceController









        .BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY;



















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



















import static org.mockito.Mockito.spy;









import static org.mockito.Mockito.when;



















import android.content.Context;









import android.support.v14.preference.SwitchPreference;









import android.support.v7.preference.PreferenceScreen;



















import com.android.settings.TestConfig;









import com.android.settings.testutils.SettingsRobolectricTestRunner;









import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;



















import org.junit.Before;









import org.junit.Test;









import org.junit.runner.RunWith;









import org.mockito.Mock;









import org.mockito.MockitoAnnotations;









import org.robolectric.RuntimeEnvironment;









import org.robolectric.annotation.Config;



















@RunWith(SettingsRobolectricTestRunner.class)









@Config(manifest = TestConfig.MANIFEST_PATH,









        sdk = TestConfig.SDK_VERSION,









        shadows = {SettingsShadowSystemProperties.class})









public class BluetoothDelayReportsPreferenceControllerTest {



















    @Mock









    private PreferenceScreen mPreferenceScreen;



















    private Context mContext;









    private SwitchPreference mPreference;









    private BluetoothDelayReportsPreferenceController mController;



















    @Before









    public void setup() {









        MockitoAnnotations.initMocks(this);









        mContext = RuntimeEnvironment.application;









        mPreference = new SwitchPreference(mContext);









        mController = spy(new BluetoothDelayReportsPreferenceController(mContext));









        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(









                mPreference);









        mController.displayPreference(mPreferenceScreen);









    }



















    @Test









    public void onPreferenceChanged_settingEnabled_turnOnDelayReports() {









        mController.onPreferenceChange(mPreference, true /* new value */);



















        final boolean mode = SettingsShadowSystemProperties.getBoolean(









                BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);



















        assertThat(mode).isTrue();









    }



















    @Test









    public void onPreferenceChanged_settingDisabled_turnOffDelayReports() {









        mController.onPreferenceChange(mPreference, false /* new value */);



















        final boolean mode = SettingsShadowSystemProperties.getBoolean(









                BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);



















        assertThat(mode).isFalse();









    }



















    @Test









    public void updateState_settingEnabled_preferenceShouldBeChecked() {









        SettingsShadowSystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,









                Boolean.toString(true));









        mController.updateState(mPreference);



















        assertThat(mPreference.isChecked()).isTrue();









    }



















    @Test









    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {









        SettingsShadowSystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,









                Boolean.toString(false));









        mController.updateState(mPreference);



















        assertThat(mPreference.isChecked()).isFalse();









    }



















    @Test









    public void onDeveloperOptionsDisabled_shouldDisablePreference() {









        mController.onDeveloperOptionsDisabled();



















        final boolean mode = SettingsShadowSystemProperties.getBoolean(









                BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);



















        assertThat(mode).isFalse();









        assertThat(mPreference.isEnabled()).isFalse();









        assertThat(mPreference.isChecked()).isFalse();









    }



















    @Test









    public void onDeveloperOptionsEnabled_shouldEnablePreference() {









        mController.onDeveloperOptionsEnabled();



















        final boolean mode = SettingsShadowSystemProperties.getBoolean(









                BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);



















        assertThat(mode).isFalse();









        assertThat(mPreference.isEnabled()).isTrue();









        assertThat(mPreference.isChecked()).isFalse();









    }









}








 No newline at end of file