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

Commit 8c49b368 authored by Rongxuan Liu's avatar Rongxuan Liu
Browse files

Remove leaudio_broadcast_feature_support flag 

Bug: 316005152
Test: m com.android.btservices
Change-Id: I9506690e1a484444a70e4f9ac31cb358e3a6f0e3
parent 97a48431

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+1 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static com.android.bluetooth.flags.Flags.leaudioBigDependsOnAudioState; 
import static com.android.bluetooth.flags.Flags.leaudioBroadcastAssistantPeripheralEntrustment;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastAudioHandoverPolicies;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastExtractPeriodicScannerFromStateMachine;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastFeatureSupport;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastMonitorSourceSyncStatus;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastResyncHelper;
@@ -278,8 +277,7 @@ public class BassClientService extends ProfileService { 
    }



    public static boolean isEnabled() {

        return leaudioBroadcastFeatureSupport()

                && BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false);

        return BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false);

    }



    private static class SourceSyncRequest {

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+1 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.android.bluetooth.bass_client.BassConstants.INVALID_BROADCAST_ 
import static com.android.bluetooth.flags.Flags.leaudioAllowedContextMask;

import static com.android.bluetooth.flags.Flags.leaudioBigDependsOnAudioState;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastAssistantPeripheralEntrustment;

import static com.android.bluetooth.flags.Flags.leaudioBroadcastFeatureSupport;

import static com.android.bluetooth.flags.Flags.leaudioUseAudioModeListener;

import static com.android.modules.utils.build.SdkLevel.isAtLeastU;
@@ -508,8 +507,7 @@ public class LeAudioService extends ProfileService { 
    }



    public static boolean isBroadcastEnabled() {

        return leaudioBroadcastFeatureSupport()

                && BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false);

        return BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false);

    }



    private boolean registerTmap() {

android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java

+0 −6
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.bluetooth.BluetoothEventLogger; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.hearingaid.HearingAidService;

import com.android.bluetooth.le_audio.LeAudioService;

import com.android.internal.annotations.VisibleForTesting;
@@ -2166,11 +2165,6 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
     * @return {@code true} if is broadcasting audio, {@code false} otherwise

     */

    private boolean isBroadcastActive() {

        if (!Flags.leaudioBroadcastFeatureSupport()) {

            // disable this if feature flag is false

            return false;

        }



        return mLeAudioService != null && mLeAudioService.isBroadcastActive();

    }

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,6 @@ public class LeAudioServiceTest { 
    /** Test setting connection policy */

    @Test

    public void testSetConnectionPolicy() {

        mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_BROADCAST_FEATURE_SUPPORT);

        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        doReturn(true).when(mNativeInterface).disconnectLeAudio(any(BluetoothDevice.class));

        doReturn(true)

android/app/tests/unit/src/com/android/bluetooth/mcp/MediaControlGattServiceTest.java

+4 −9
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.test.runner.AndroidJUnit4; 


import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.le_audio.LeAudioService;



import org.junit.After;
@@ -1037,19 +1036,15 @@ public class MediaControlGattServiceTest { 


    @Test

    public void testMediaControlPointeRequest_OpcodePlayCallLeAudioServiceSetActiveDevice() {

        mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_BROADCAST_FEATURE_SUPPORT);

        initAllFeaturesGattService();

        prepareConnectedDevice();

        mMcpService.updateSupportedOpcodesChar(Request.SupportedOpcodes.PLAY, true);

        verifyMediaControlPointRequest(Request.Opcodes.PLAY, null, BluetoothGatt.GATT_SUCCESS, 1);

        if (!Flags.leaudioBroadcastFeatureSupport()) {

            verify(mMockLeAudioService).setActiveDevice(any(BluetoothDevice.class));

        } else {



        final List<BluetoothLeBroadcastMetadata> metadataList = mock(List.class);

        when(mMockLeAudioService.getAllBroadcastMetadata()).thenReturn(metadataList);

        verify(mMockMcsCallbacks, times(1)).onMediaControlRequest(any(Request.class));

    }

    }



    @Test

    public void testPlaybackSpeedWrite() {