Add LE audio hardware offload development option
Bug: 197296692 Bug: 215492586 Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest Change-Id: If1203c50d1d94ac9ed377293b5cb389b7b6f54a1 Merged-In: If1203c50d1d94ac9ed377293b5cb389b7b6f54a1
This commit is contained in:
@@ -329,14 +329,16 @@
|
|||||||
|
|
||||||
<!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
|
<!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
|
||||||
<string name="bluetooth_disable_a2dp_hw_offload">Disable Bluetooth A2DP hardware offload</string>
|
<string name="bluetooth_disable_a2dp_hw_offload">Disable Bluetooth A2DP hardware offload</string>
|
||||||
<!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
|
<!-- UI debug setting: Disable Bluetooth LE AUDIO hardware offload [CHAR LIMIT=none] -->
|
||||||
<string name="bluetooth_disable_a2dp_hw_offload_dialog_title">Restart Device?</string>
|
<string name="bluetooth_disable_le_audio_hw_offload">Disable Bluetooth LE AUDIO hardware offload</string>
|
||||||
<!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
|
<!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
|
||||||
<string name="bluetooth_disable_a2dp_hw_offload_dialog_message">You need to restart your device to change this setting.</string>
|
<string name="bluetooth_disable_hw_offload_dialog_title">Restart Device?</string>
|
||||||
<!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
|
<!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
|
||||||
<string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Restart</string>
|
<string name="bluetooth_disable_hw_offload_dialog_message">You need to restart your device to change this setting.</string>
|
||||||
<!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
|
<!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
|
||||||
<string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Cancel</string>
|
<string name="bluetooth_disable_hw_offload_dialog_confirm">Restart</string>
|
||||||
|
<!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
|
||||||
|
<string name="bluetooth_disable_hw_offload_dialog_cancel">Cancel</string>
|
||||||
|
|
||||||
<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
|
<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
|
||||||
<string name="connected_device_media_device_title">Media devices</string>
|
<string name="connected_device_media_device_title">Media devices</string>
|
||||||
|
@@ -317,6 +317,10 @@
|
|||||||
android:key="bluetooth_disable_a2dp_hw_offload"
|
android:key="bluetooth_disable_a2dp_hw_offload"
|
||||||
android:title="@string/bluetooth_disable_a2dp_hw_offload" />
|
android:title="@string/bluetooth_disable_a2dp_hw_offload" />
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="bluetooth_disable_le_audio_hw_offload"
|
||||||
|
android:title="@string/bluetooth_disable_le_audio_hw_offload" />
|
||||||
|
|
||||||
<ListPreference
|
<ListPreference
|
||||||
android:key="bluetooth_select_avrcp_version"
|
android:key="bluetooth_select_avrcp_version"
|
||||||
android:title="@string/bluetooth_select_avrcp_version_string"
|
android:title="@string/bluetooth_select_avrcp_version_string"
|
||||||
|
@@ -16,9 +16,12 @@
|
|||||||
|
|
||||||
package com.android.settings.development;
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import static com.android.settings.development.BluetoothLeAudioHwOffloadPreferenceController.LE_AUDIO_OFFLOAD_DISABLED_PROPERTY;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.SystemProperties;
|
import android.os.SystemProperties;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.SwitchPreference;
|
import androidx.preference.SwitchPreference;
|
||||||
|
|
||||||
@@ -34,6 +37,9 @@ public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptions
|
|||||||
static final String A2DP_OFFLOAD_DISABLED_PROPERTY = "persist.bluetooth.a2dp_offload.disabled";
|
static final String A2DP_OFFLOAD_DISABLED_PROPERTY = "persist.bluetooth.a2dp_offload.disabled";
|
||||||
static final String A2DP_OFFLOAD_SUPPORTED_PROPERTY = "ro.bluetooth.a2dp_offload.supported";
|
static final String A2DP_OFFLOAD_SUPPORTED_PROPERTY = "ro.bluetooth.a2dp_offload.supported";
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
boolean mChanged = false;
|
||||||
|
|
||||||
public BluetoothA2dpHwOffloadPreferenceController(Context context,
|
public BluetoothA2dpHwOffloadPreferenceController(Context context,
|
||||||
DevelopmentSettingsDashboardFragment fragment) {
|
DevelopmentSettingsDashboardFragment fragment) {
|
||||||
super(context);
|
super(context);
|
||||||
@@ -47,7 +53,8 @@ public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptions
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
BluetoothA2dpHwOffloadRebootDialog.show(mFragment, this);
|
BluetoothHwOffloadRebootDialog.show(mFragment);
|
||||||
|
mChanged = true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,10 +92,26 @@ public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptions
|
|||||||
return offloadSupported ? !offloadDisabled : true;
|
return offloadSupported ? !offloadDisabled : true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onA2dpHwDialogConfirmed() {
|
/**
|
||||||
|
* Called when the HwOffloadDialog confirm is clicked.
|
||||||
|
*/
|
||||||
|
public void onHwOffloadDialogConfirmed() {
|
||||||
|
if (!mChanged) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
final boolean offloadDisabled =
|
final boolean offloadDisabled =
|
||||||
SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
|
SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
|
||||||
SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(!offloadDisabled));
|
SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(!offloadDisabled));
|
||||||
|
if (offloadDisabled) {
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY,
|
||||||
|
Boolean.toString(!offloadDisabled));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when the HwOffloadDialog cancel is clicked.
|
||||||
|
*/
|
||||||
|
public void onHwOffloadDialogCanceled() {
|
||||||
|
mChanged = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -28,17 +28,23 @@ import androidx.fragment.app.FragmentManager;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||||
|
|
||||||
public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragment
|
/**
|
||||||
|
* The a2dp and LE audio offload switch should reboot the device to take effect, the dialog is
|
||||||
|
* to ask the user to reboot the device after a2dp or LE audio offload user preference changed
|
||||||
|
*/
|
||||||
|
public class BluetoothHwOffloadRebootDialog extends InstrumentedDialogFragment
|
||||||
implements DialogInterface.OnClickListener {
|
implements DialogInterface.OnClickListener {
|
||||||
|
|
||||||
public static final String TAG = "BluetoothA2dpHwOffloadReboot";
|
public static final String TAG = "BluetoothHwOffloadReboot";
|
||||||
|
|
||||||
public static void show(DevelopmentSettingsDashboardFragment host,
|
/**
|
||||||
BluetoothA2dpHwOffloadPreferenceController controller) {
|
* The function to show the HwOffloadReboot Dialog.
|
||||||
|
*/
|
||||||
|
public static void show(DevelopmentSettingsDashboardFragment host) {
|
||||||
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
|
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
|
||||||
if (manager.findFragmentByTag(TAG) == null) {
|
if (manager.findFragmentByTag(TAG) == null) {
|
||||||
final BluetoothA2dpHwOffloadRebootDialog dialog =
|
final BluetoothHwOffloadRebootDialog dialog =
|
||||||
new BluetoothA2dpHwOffloadRebootDialog();
|
new BluetoothHwOffloadRebootDialog();
|
||||||
dialog.setTargetFragment(host, 0 /* requestCode */);
|
dialog.setTargetFragment(host, 0 /* requestCode */);
|
||||||
dialog.show(manager, TAG);
|
dialog.show(manager, TAG);
|
||||||
}
|
}
|
||||||
@@ -52,33 +58,44 @@ public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragme
|
|||||||
@Override
|
@Override
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||||
return new AlertDialog.Builder(getActivity())
|
return new AlertDialog.Builder(getActivity())
|
||||||
.setMessage(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message)
|
.setMessage(R.string.bluetooth_disable_hw_offload_dialog_message)
|
||||||
.setTitle(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title)
|
.setTitle(R.string.bluetooth_disable_hw_offload_dialog_title)
|
||||||
.setPositiveButton(
|
.setPositiveButton(
|
||||||
R.string.bluetooth_disable_a2dp_hw_offload_dialog_confirm, this)
|
R.string.bluetooth_disable_hw_offload_dialog_confirm, this)
|
||||||
.setNegativeButton(
|
.setNegativeButton(
|
||||||
R.string.bluetooth_disable_a2dp_hw_offload_dialog_cancel, this)
|
R.string.bluetooth_disable_hw_offload_dialog_cancel, this)
|
||||||
.create();
|
.create();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
final OnA2dpHwDialogConfirmedListener host =
|
final OnHwOffloadDialogListener host =
|
||||||
(OnA2dpHwDialogConfirmedListener) getTargetFragment();
|
(OnHwOffloadDialogListener) getTargetFragment();
|
||||||
if (host == null) {
|
if (host == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (which == DialogInterface.BUTTON_POSITIVE) {
|
if (which == DialogInterface.BUTTON_POSITIVE) {
|
||||||
host.onA2dpHwDialogConfirmed();
|
host.onHwOffloadDialogConfirmed();
|
||||||
PowerManager pm = getContext().getSystemService(PowerManager.class);
|
PowerManager pm = getContext().getSystemService(PowerManager.class);
|
||||||
pm.reboot(null);
|
pm.reboot(null);
|
||||||
|
} else {
|
||||||
|
host.onHwOffloadDialogCanceled();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface OnA2dpHwDialogConfirmedListener {
|
/**
|
||||||
|
* The interface for the HsOffloadDialogListener to provide the action as the
|
||||||
|
* confirmed or canceled clicked.
|
||||||
|
*/
|
||||||
|
public interface OnHwOffloadDialogListener {
|
||||||
/**
|
/**
|
||||||
* Called when the user presses reboot on the warning dialog.
|
* Called when the user presses reboot on the warning dialog.
|
||||||
*/
|
*/
|
||||||
void onA2dpHwDialogConfirmed();
|
void onHwOffloadDialogConfirmed();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when the user presses cancel on the warning dialog.
|
||||||
|
*/
|
||||||
|
void onHwOffloadDialogCanceled();
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,127 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2022 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.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_SUPPORTED_PROPERTY;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference controller to control Bluetooth LE audio offload
|
||||||
|
*/
|
||||||
|
public class BluetoothLeAudioHwOffloadPreferenceController
|
||||||
|
extends DeveloperOptionsPreferenceController
|
||||||
|
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
|
||||||
|
|
||||||
|
private static final String PREFERENCE_KEY = "bluetooth_disable_le_audio_hw_offload";
|
||||||
|
private final DevelopmentSettingsDashboardFragment mFragment;
|
||||||
|
|
||||||
|
static final String LE_AUDIO_OFFLOAD_DISABLED_PROPERTY =
|
||||||
|
"persist.bluetooth.leaudio_offload.disabled";
|
||||||
|
static final String LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY =
|
||||||
|
"ro.bluetooth.leaudio_offload.supported";
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
boolean mChanged = false;
|
||||||
|
|
||||||
|
public BluetoothLeAudioHwOffloadPreferenceController(Context context,
|
||||||
|
DevelopmentSettingsDashboardFragment fragment) {
|
||||||
|
super(context);
|
||||||
|
mFragment = fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return PREFERENCE_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
BluetoothHwOffloadRebootDialog.show(mFragment);
|
||||||
|
mChanged = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
final boolean offloadSupported =
|
||||||
|
SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)
|
||||||
|
&& SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY, false);
|
||||||
|
if (offloadSupported) {
|
||||||
|
final boolean offloadDisabled =
|
||||||
|
SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true);
|
||||||
|
((SwitchPreference) mPreference).setChecked(offloadDisabled);
|
||||||
|
} else {
|
||||||
|
mPreference.setEnabled(false);
|
||||||
|
((SwitchPreference) mPreference).setChecked(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
|
super.onDeveloperOptionsSwitchDisabled();
|
||||||
|
final boolean offloadSupported =
|
||||||
|
SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)
|
||||||
|
&& SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY, false);
|
||||||
|
if (offloadSupported) {
|
||||||
|
((SwitchPreference) mPreference).setChecked(true);
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, "true");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the le audio offload setting is default value.
|
||||||
|
*/
|
||||||
|
public boolean isDefaultValue() {
|
||||||
|
final boolean offloadSupported =
|
||||||
|
SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)
|
||||||
|
&& SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY, false);
|
||||||
|
final boolean offloadDisabled =
|
||||||
|
SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, false);
|
||||||
|
return offloadSupported ? offloadDisabled : true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when the HwOffloadDialog confirm is clicked.
|
||||||
|
*/
|
||||||
|
public void onHwOffloadDialogConfirmed() {
|
||||||
|
if (!mChanged) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean offloadDisabled =
|
||||||
|
SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY,
|
||||||
|
false);
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY,
|
||||||
|
Boolean.toString(!offloadDisabled));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when the HwOffloadDialog cancel is clicked.
|
||||||
|
*/
|
||||||
|
public void onHwOffloadDialogCanceled() {
|
||||||
|
mChanged = false;
|
||||||
|
}
|
||||||
|
}
|
@@ -79,7 +79,7 @@ import java.util.List;
|
|||||||
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
|
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
|
||||||
implements OnMainSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
|
implements OnMainSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
|
||||||
AdbClearKeysDialogHost, LogPersistDialogHost,
|
AdbClearKeysDialogHost, LogPersistDialogHost,
|
||||||
BluetoothA2dpHwOffloadRebootDialog.OnA2dpHwDialogConfirmedListener,
|
BluetoothHwOffloadRebootDialog.OnHwOffloadDialogListener,
|
||||||
AbstractBluetoothPreferenceController.Callback {
|
AbstractBluetoothPreferenceController.Callback {
|
||||||
|
|
||||||
private static final String TAG = "DevSettingsDashboard";
|
private static final String TAG = "DevSettingsDashboard";
|
||||||
@@ -287,12 +287,16 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
if (isChecked) {
|
if (isChecked) {
|
||||||
EnableDevelopmentSettingWarningDialog.show(this /* host */);
|
EnableDevelopmentSettingWarningDialog.show(this /* host */);
|
||||||
} else {
|
} else {
|
||||||
final BluetoothA2dpHwOffloadPreferenceController controller =
|
final BluetoothA2dpHwOffloadPreferenceController a2dpController =
|
||||||
getDevelopmentOptionsController(
|
getDevelopmentOptionsController(
|
||||||
BluetoothA2dpHwOffloadPreferenceController.class);
|
BluetoothA2dpHwOffloadPreferenceController.class);
|
||||||
// If A2DP hardware offload isn't default value, we must reboot after disable
|
final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
|
||||||
|
getDevelopmentOptionsController(
|
||||||
|
BluetoothLeAudioHwOffloadPreferenceController.class);
|
||||||
|
// If hardware offload isn't default value, we must reboot after disable
|
||||||
// developer options. Show a dialog for the user to confirm.
|
// developer options. Show a dialog for the user to confirm.
|
||||||
if (controller == null || controller.isDefaultValue()) {
|
if ((a2dpController == null || a2dpController.isDefaultValue())
|
||||||
|
&& (leAudioController == null || leAudioController.isDefaultValue())) {
|
||||||
disableDeveloperOptions();
|
disableDeveloperOptions();
|
||||||
} else {
|
} else {
|
||||||
DisableDevSettingsDialogFragment.show(this /* host */);
|
DisableDevSettingsDialogFragment.show(this /* host */);
|
||||||
@@ -352,10 +356,27 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onA2dpHwDialogConfirmed() {
|
public void onHwOffloadDialogConfirmed() {
|
||||||
final BluetoothA2dpHwOffloadPreferenceController controller =
|
final BluetoothA2dpHwOffloadPreferenceController a2dpController =
|
||||||
getDevelopmentOptionsController(BluetoothA2dpHwOffloadPreferenceController.class);
|
getDevelopmentOptionsController(BluetoothA2dpHwOffloadPreferenceController.class);
|
||||||
controller.onA2dpHwDialogConfirmed();
|
a2dpController.onHwOffloadDialogConfirmed();
|
||||||
|
|
||||||
|
final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
|
||||||
|
getDevelopmentOptionsController(
|
||||||
|
BluetoothLeAudioHwOffloadPreferenceController.class);
|
||||||
|
leAudioController.onHwOffloadDialogConfirmed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onHwOffloadDialogCanceled() {
|
||||||
|
final BluetoothA2dpHwOffloadPreferenceController a2dpController =
|
||||||
|
getDevelopmentOptionsController(BluetoothA2dpHwOffloadPreferenceController.class);
|
||||||
|
a2dpController.onHwOffloadDialogCanceled();
|
||||||
|
|
||||||
|
final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
|
||||||
|
getDevelopmentOptionsController(
|
||||||
|
BluetoothLeAudioHwOffloadPreferenceController.class);
|
||||||
|
leAudioController.onHwOffloadDialogCanceled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -514,6 +535,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
|
controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
|
||||||
controllers.add(new BluetoothMapVersionPreferenceController(context));
|
controllers.add(new BluetoothMapVersionPreferenceController(context));
|
||||||
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
||||||
|
controllers.add(new BluetoothLeAudioHwOffloadPreferenceController(context, fragment));
|
||||||
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
||||||
controllers.add(new NfcStackDebugLogPreferenceController(context));
|
controllers.add(new NfcStackDebugLogPreferenceController(context));
|
||||||
controllers.add(new ShowTapsPreferenceController(context));
|
controllers.add(new ShowTapsPreferenceController(context));
|
||||||
|
@@ -56,15 +56,15 @@ public class DisableDevSettingsDialogFragment extends InstrumentedDialogFragment
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||||
// Reuse the same text of disable_a2dp_hw_offload_dialog.
|
// Reuse the same text of disable_hw_offload_dialog.
|
||||||
// The text is generic enough to be used for turning off Dev options.
|
// The text is generic enough to be used for turning off Dev options.
|
||||||
return new AlertDialog.Builder(getActivity())
|
return new AlertDialog.Builder(getActivity())
|
||||||
.setMessage(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message)
|
.setMessage(R.string.bluetooth_disable_hw_offload_dialog_message)
|
||||||
.setTitle(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title)
|
.setTitle(R.string.bluetooth_disable_hw_offload_dialog_title)
|
||||||
.setPositiveButton(
|
.setPositiveButton(
|
||||||
R.string.bluetooth_disable_a2dp_hw_offload_dialog_confirm, this)
|
R.string.bluetooth_disable_hw_offload_dialog_confirm, this)
|
||||||
.setNegativeButton(
|
.setNegativeButton(
|
||||||
R.string.bluetooth_disable_a2dp_hw_offload_dialog_cancel, this)
|
R.string.bluetooth_disable_hw_offload_dialog_cancel, this)
|
||||||
.create();
|
.create();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -18,6 +18,8 @@ package com.android.settings.development;
|
|||||||
|
|
||||||
import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController
|
import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController
|
||||||
.A2DP_OFFLOAD_DISABLED_PROPERTY;
|
.A2DP_OFFLOAD_DISABLED_PROPERTY;
|
||||||
|
import static com.android.settings.development.BluetoothLeAudioHwOffloadPreferenceController
|
||||||
|
.LE_AUDIO_OFFLOAD_DISABLED_PROPERTY;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
@@ -62,15 +64,37 @@ public class BluetoothA2dpHwOffloadPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onA2dpHwDialogConfirmed_shouldChangeProperty() {
|
public void onA2dpHwDialogConfirmedAsA2dpOffloadDisabled_shouldChangeProperty() {
|
||||||
SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
|
SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
|
||||||
|
mController.mChanged = true;
|
||||||
|
|
||||||
mController.onA2dpHwDialogConfirmed();
|
mController.onHwOffloadDialogConfirmed();
|
||||||
final boolean mode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
|
final boolean mode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
|
||||||
assertThat(mode).isTrue();
|
assertThat(mode).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
mController.onA2dpHwDialogConfirmed();
|
@Test
|
||||||
final boolean mode2 = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
|
public void onA2dpHwDialogConfirmedAsA2dpOffloadEnabled_shouldChangeProperty() {
|
||||||
assertThat(mode2).isFalse();
|
SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(true));
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(true));
|
||||||
|
|
||||||
|
mController.mChanged = true;
|
||||||
|
|
||||||
|
mController.onHwOffloadDialogConfirmed();
|
||||||
|
final boolean a2dpMode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, true);
|
||||||
|
final boolean leAudioMode = SystemProperties
|
||||||
|
.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true);
|
||||||
|
assertThat(a2dpMode).isFalse();
|
||||||
|
assertThat(leAudioMode).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onA2dpHwDialogCanceled_shouldNotChangeProperty() {
|
||||||
|
SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
|
||||||
|
mController.mChanged = true;
|
||||||
|
|
||||||
|
mController.onHwOffloadDialogCanceled();
|
||||||
|
final boolean mode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
|
||||||
|
assertThat(mode).isFalse();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,94 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 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.BluetoothLeAudioHwOffloadPreferenceController
|
||||||
|
.LE_AUDIO_OFFLOAD_DISABLED_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.os.SystemProperties;
|
||||||
|
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
|
||||||
|
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 BluetoothLeAudioHwOffloadPreferenceControllerTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
@Mock
|
||||||
|
private DevelopmentSettingsDashboardFragment mFragment;
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private SwitchPreference mPreference;
|
||||||
|
private BluetoothLeAudioHwOffloadPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mPreference = new SwitchPreference(mContext);
|
||||||
|
mController = spy(new BluetoothLeAudioHwOffloadPreferenceController(mContext, mFragment));
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
|
.thenReturn(mPreference);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLeAudioHwDialogConfirmedAsLeAudioOffloadDisabled_shouldChangeProperty() {
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
|
||||||
|
mController.mChanged = true;
|
||||||
|
|
||||||
|
mController.onHwOffloadDialogConfirmed();
|
||||||
|
final boolean mode = SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, false);
|
||||||
|
assertThat(mode).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLeAudioHwDialogConfirmedAsLeAudioOffloadEnabled_shouldChangeProperty() {
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(true));
|
||||||
|
mController.mChanged = true;
|
||||||
|
|
||||||
|
mController.onHwOffloadDialogConfirmed();
|
||||||
|
final boolean mode2 = SystemProperties.getBoolean(
|
||||||
|
LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true);
|
||||||
|
assertThat(mode2).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLeAudioHwDialogCanceled_shouldNotChangeProperty() {
|
||||||
|
SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
|
||||||
|
mController.mChanged = true;
|
||||||
|
|
||||||
|
mController.onHwOffloadDialogCanceled();
|
||||||
|
final boolean mode = SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, false);
|
||||||
|
assertThat(mode).isFalse();
|
||||||
|
}
|
||||||
|
}
|
@@ -202,9 +202,9 @@ public class DevelopmentSettingsDashboardFragmentTest {
|
|||||||
assertThat(dialog).isNotNull();
|
assertThat(dialog).isNotNull();
|
||||||
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
||||||
assertThat(shadowDialog.getTitle()).isEqualTo(
|
assertThat(shadowDialog.getTitle()).isEqualTo(
|
||||||
mContext.getString(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title));
|
mContext.getString(R.string.bluetooth_disable_hw_offload_dialog_title));
|
||||||
assertThat(shadowDialog.getMessage()).isEqualTo(
|
assertThat(shadowDialog.getMessage()).isEqualTo(
|
||||||
mContext.getString(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message));
|
mContext.getString(R.string.bluetooth_disable_hw_offload_dialog_message));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Reference in New Issue
Block a user