Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6edb515a authored by Jack He's avatar Jack He Committed by Android (Google) Code Review
Browse files

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

This reverts commit 345889b5.

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

Bug: 280626194
Change-Id: I93f66f22b55eb906f8e079de35f2db00b102c788
parent 345889b5

src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java

+18 −2
Original line number Diff line number Diff line
@@ -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

     */
@@ -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.");

            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)) {
@@ -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

     */
@@ -361,11 +369,19 @@ 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);

            }

        }

    }