Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973 Change-Id: Ibb05089fd8a8245966e5ff9817e4a25833ccd442 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -390,6 +390,11 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
getDevelopmentOptionsController(
|
||||
BluetoothLeAudioPreferenceController.class);
|
||||
leAudioFeatureController.onRebootDialogConfirmed();
|
||||
|
||||
final BluetoothLeAudioAllowListPreferenceController leAudioAllowListController =
|
||||
getDevelopmentOptionsController(
|
||||
BluetoothLeAudioAllowListPreferenceController.class);
|
||||
leAudioAllowListController.onRebootDialogConfirmed();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -407,6 +412,11 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
getDevelopmentOptionsController(
|
||||
BluetoothLeAudioPreferenceController.class);
|
||||
leAudioFeatureController.onRebootDialogCanceled();
|
||||
|
||||
final BluetoothLeAudioAllowListPreferenceController leAudioAllowListController =
|
||||
getDevelopmentOptionsController(
|
||||
BluetoothLeAudioAllowListPreferenceController.class);
|
||||
leAudioAllowListController.onRebootDialogCanceled();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -603,6 +613,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
|
||||
controllers.add(new BluetoothMapVersionPreferenceController(context));
|
||||
controllers.add(new BluetoothLeAudioPreferenceController(context, fragment));
|
||||
controllers.add(new BluetoothLeAudioAllowListPreferenceController(context, fragment));
|
||||
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
||||
controllers.add(new BluetoothLeAudioHwOffloadPreferenceController(context, fragment));
|
||||
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
||||
|
Reference in New Issue
Block a user