From 560abbcc4914d1ad552a9f59b9236957d3afc9f8 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Tue, 9 May 2023 06:28:50 +0000 Subject: [PATCH] Revert "Revert "Remove CSIP/VCP enable/disable from Setting"" This reverts commit 6edb515a9fc91e4d29764c2a22a892151e91fcc3. Reason for revert: we need this change and need to merge together with prebuilt Bug: 280626194 Change-Id: Id883c6c7c778154038c249f7be8e9fabf52299c3 --- .../BluetoothDetailsProfilesController.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index f69cf580d51..6b58b2c786c 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -320,7 +320,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll } /** - * Disable the Le Audio profile, VCP, and CSIP for each of the Le Audio devices. + * Disable the Le Audio profile for each of the Le Audio devices. * * @param profile the LeAudio profile */ @@ -329,20 +329,12 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll Log.e(TAG, "There is no the LE profile or no device in mProfileDeviceMap. Do nothing."); return; } - LocalBluetoothProfile vcp = mProfileManager.getVolumeControlProfile(); - LocalBluetoothProfile csip = mProfileManager.getCsipSetCoordinatorProfile(); for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) { Log.d(TAG, "device:" + leAudioDevice.getDevice().getAnonymizedAddress() + "disable LE profile"); profile.setEnabled(leAudioDevice.getDevice(), false); - if (vcp != null) { - vcp.setEnabled(leAudioDevice.getDevice(), false); - } - if (csip != null) { - csip.setEnabled(leAudioDevice.getDevice(), false); - } } if (!SystemProperties.getBoolean(ENABLE_DUAL_MODE_AUDIO, false)) { @@ -353,7 +345,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll } /** - * Enable the Le Audio profile, VCP, and CSIP for each of the Le Audio devices. + * Enable the Le Audio profile for each of the Le Audio devices. * * @param profile the LeAudio profile */ @@ -369,19 +361,11 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll disableProfileBeforeUserEnablesLeAudio(mProfileManager.getHeadsetProfile()); } - LocalBluetoothProfile vcp = mProfileManager.getVolumeControlProfile(); - LocalBluetoothProfile csip = mProfileManager.getCsipSetCoordinatorProfile(); for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) { Log.d(TAG, "device:" + leAudioDevice.getDevice().getAnonymizedAddress() + "enable LE profile"); profile.setEnabled(leAudioDevice.getDevice(), true); - if (vcp != null) { - vcp.setEnabled(leAudioDevice.getDevice(), true); - } - if (csip != null) { - csip.setEnabled(leAudioDevice.getDevice(), true); - } } }