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

Commit de9d7061 authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Determine LeAudio toggle visibility after mIsLeAudioOnlyDevice is initialized" into main

parents 9eaf954e 7a40ecd9
Loading
Loading
Loading
Loading
+9 −8
Original line number Diff line number Diff line
@@ -182,7 +182,15 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
        }

        if (profile instanceof LeAudioProfile) {
            profilePref.setVisible(mIsLeAudioToggleEnabled);
            boolean showLeAudioToggle = mIsLeAudioToggleEnabled;
            if (Flags.hideLeAudioToggleForLeAudioOnlyDevice() && mIsLeAudioOnlyDevice) {
                showLeAudioToggle = false;
                Log.d(
                        TAG,
                        "Hide LeAudio toggle for LeAudio-only Device: "
                                + mCachedDevice.getDevice().getAnonymizedAddress());
            }
            profilePref.setVisible(showLeAudioToggle);
        }

        if (profile instanceof MapProfile) {
@@ -526,13 +534,6 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
        boolean isLeEnabledByDefault =
                SystemProperties.getBoolean(LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY, true);
        mIsLeAudioToggleEnabled = isLeAudioToggleVisible || isLeEnabledByDefault;
        if (Flags.hideLeAudioToggleForLeAudioOnlyDevice() && mIsLeAudioOnlyDevice) {
            mIsLeAudioToggleEnabled = false;
            Log.d(
                    TAG,
                    "Hide LeAudio toggle for LeAudio-only Device: "
                            + mCachedDevice.getDevice().getAnonymizedAddress());
        }
        Log.d(TAG, "BT_LE_AUDIO_CONTACT_SHARING_ENABLED:" + mIsLeContactSharingEnabled
                + ", LE_AUDIO_TOGGLE_VISIBLE_PROPERTY:" + isLeAudioToggleVisible
                + ", LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY:" + isLeEnabledByDefault);