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

Commit 8228f759 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Gate legacy audio sharing" into main

parents 97c80095 84cde064

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.media.controls.ui.controller; 


import static android.provider.Settings.ACTION_MEDIA_CONTROLS_SETTINGS;



import static com.android.systemui.Flags.legacyLeAudioSharing;

import static com.android.settingslib.flags.Flags.legacyLeAudioSharing;

import static com.android.systemui.media.controls.shared.model.SmartspaceMediaDataKt.NUM_REQUIRED_RECOMMENDATIONS;



import android.animation.Animator;

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.media.dialog;



import static com.android.settingslib.flags.Flags.legacyLeAudioSharing;



import android.app.AlertDialog;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothLeBroadcastAssistant;
@@ -492,6 +494,7 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog { 


    @Override

    public boolean isBroadcastSupported() {

        if (!legacyLeAudioSharing()) return false;

        boolean isBluetoothLeDevice = false;

        if (mMediaOutputController.getCurrentConnectedMediaDevice() != null) {

            isBluetoothLeDevice = mMediaOutputController.isBluetoothLeDevice(

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.media.dialog;



import static com.android.systemui.Flags.legacyLeAudioSharing;

import static com.android.settingslib.flags.Flags.legacyLeAudioSharing;



import android.content.Context;

import android.os.Bundle;

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.media.dialog



import com.android.settingslib.flags.Flags.legacyLeAudioSharing

import android.content.BroadcastReceiver

import android.content.Context

import android.content.Intent
@@ -44,6 +45,7 @@ class MediaOutputDialogReceiver @Inject constructor( 
                mediaOutputDialogFactory.createDialogForSystemRouting()

            }

            MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_BROADCAST_DIALOG -> {

                if (!legacyLeAudioSharing()) return

                val packageName: String? =

                    intent.getStringExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME)

                launchMediaOutputBroadcastDialogIfPossible(packageName)

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaControlPanelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_LEGACY_LE_AUDIO_SHARING)

    @RequiresFlagsEnabled(com.android.settingslib.flags.Flags.FLAG_LEGACY_LE_AUDIO_SHARING)

    fun bindBroadcastButton() {

        initMediaViewHolderMocks()

        initDeviceMediaData(true, APP_NAME)