PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove CSIP/VCP enable/disable from Setting"

Browse Source 
This reverts commit 345889b5e2.

Reason for revert: Accidental merge, should merge together with prebuilt

Bug: 280626194
Change-Id: I93f66f22b55eb906f8e079de35f2db00b102c788
This commit is contained in:
Jack He
2023-05-09 02:44:45 +00:00
committed by Android (Google) Code Review
parent 345889b5e2
commit 6edb515a9f
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
View File

@@ -320,7 +320,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
} }
/** /**
* Disable the Le Audio profile for each of the Le Audio devices. * Disable the Le Audio profile, VCP, and CSIP for each of the Le Audio devices.
* *
* @param profile the LeAudio profile * @param profile the LeAudio profile
*/ */
@@ -329,12 +329,20 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
Log.e(TAG, "There is no the LE profile or no device in mProfileDeviceMap. Do nothing."); Log.e(TAG, "There is no the LE profile or no device in mProfileDeviceMap. Do nothing.");
return; return;
} }
LocalBluetoothProfile vcp = mProfileManager.getVolumeControlProfile();
LocalBluetoothProfile csip = mProfileManager.getCsipSetCoordinatorProfile();
for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) { for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) {
Log.d(TAG, Log.d(TAG,
"device:" + leAudioDevice.getDevice().getAnonymizedAddress() "device:" + leAudioDevice.getDevice().getAnonymizedAddress()
+ "disable LE profile"); + "disable LE profile");
profile.setEnabled(leAudioDevice.getDevice(), false); 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)) { if (!SystemProperties.getBoolean(ENABLE_DUAL_MODE_AUDIO, false)) {
@@ -345,7 +353,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
} }
/** /**
* Enable the Le Audio profile for each of the Le Audio devices. * Enable the Le Audio profile, VCP, and CSIP for each of the Le Audio devices.
* *
* @param profile the LeAudio profile * @param profile the LeAudio profile
*/ */
@@ -361,11 +369,19 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
disableProfileBeforeUserEnablesLeAudio(mProfileManager.getHeadsetProfile()); disableProfileBeforeUserEnablesLeAudio(mProfileManager.getHeadsetProfile());
} }
LocalBluetoothProfile vcp = mProfileManager.getVolumeControlProfile();
LocalBluetoothProfile csip = mProfileManager.getCsipSetCoordinatorProfile();
for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) { for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) {
Log.d(TAG, Log.d(TAG,
"device:" + leAudioDevice.getDevice().getAnonymizedAddress() "device:" + leAudioDevice.getDevice().getAnonymizedAddress()
+ "enable LE profile"); + "enable LE profile");
profile.setEnabled(leAudioDevice.getDevice(), true); profile.setEnabled(leAudioDevice.getDevice(), true);
if (vcp != null) {
vcp.setEnabled(leAudioDevice.getDevice(), true);
}
if (csip != null) {
csip.setEnabled(leAudioDevice.getDevice(), true);
}
} }
} }