Remove CSIP/VCP enable/disable from Setting
We moved this part to Bluetooth Framework, so remove these from Setting Bug: 280626194 Test: NA Change-Id: Ia84d0d68d8d77fde7479b6d4e49743dfeb821eae
This commit is contained in:
@@ -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
|
* @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.");
|
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)) {
|
||||||
@@ -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
|
* @param profile the LeAudio profile
|
||||||
*/
|
*/
|
||||||
@@ -369,19 +361,11 @@ 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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user