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

Commit 51c5c2e4 authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Handle device connected in handler activity 

Test: atest
Flag: com.android.settingslib.flags.promote_audio_sharing_for_second_auto_connected_lea_device
Bug: 395786392
Change-Id: Icea9ad31d3115bf90557e8c2795987cd1d0c824b
parent 4b13fb36

src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerActivity.java

+13 −0
Original line number Diff line number Diff line
@@ -16,11 +16,24 @@ 


package com.android.settings.connecteddevice.audiosharing;



import android.os.Bundle;



import com.android.settings.SettingsActivity;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.flags.Flags;



public class AudioSharingJoinHandlerActivity extends SettingsActivity {

    private static final String TAG = "AudioSharingJoinHandlerActivity";



    @Override

    protected void onCreate(Bundle savedState) {

        super.onCreate(savedState);

        if (!Flags.promoteAudioSharingForSecondAutoConnectedLeaDevice()

                || !BluetoothUtils.isAudioSharingUIAvailable(this)) {

            finish();

        }

    }



    @Override

    protected boolean isToolbarEnabled() {

        return false;

src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerController.java

+220 −1
Original line number Diff line number Diff line
@@ -16,25 +16,183 @@ 


package com.android.settings.connecteddevice.audiosharing;



import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.EXTRA_BLUETOOTH_DEVICE;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothLeBroadcastAssistant;

import android.bluetooth.BluetoothLeBroadcastMetadata;

import android.bluetooth.BluetoothLeBroadcastReceiveState;

import android.bluetooth.BluetoothProfile;

import android.content.Context;

import android.content.Intent;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.WorkerThread;

import androidx.lifecycle.DefaultLifecycleObserver;

import androidx.lifecycle.LifecycleOwner;

import androidx.preference.PreferenceScreen;



import com.android.settings.bluetooth.Utils;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settingslib.bluetooth.BluetoothCallback;

import com.android.settingslib.bluetooth.BluetoothEventManager;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;

import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.flags.Flags;

import com.android.settingslib.utils.ThreadUtils;



import java.util.concurrent.Executor;

import java.util.concurrent.Executors;



public class AudioSharingJoinHandlerController extends BasePreferenceController

        implements DefaultLifecycleObserver {

        implements DefaultLifecycleObserver, BluetoothCallback {

    private static final String TAG = "AudioSharingJoinHandlerCtrl";

    private static final String KEY = "audio_sharing_join_handler";



    @Nullable private final LocalBluetoothManager mBtManager;

    @Nullable private final BluetoothEventManager mEventManager;

    @Nullable private final CachedBluetoothDeviceManager mDeviceManager;

    @Nullable private final LocalBluetoothLeBroadcastAssistant mAssistant;

    private final Executor mExecutor;

    @Nullable private DashboardFragment mFragment;

    @Nullable private AudioSharingDialogHandler mDialogHandler;

    @VisibleForTesting

    BluetoothLeBroadcastAssistant.Callback mAssistantCallback =

            new BluetoothLeBroadcastAssistant.Callback() {

                @Override

                public void onSearchStarted(int reason) {

                }



                @Override

                public void onSearchStartFailed(int reason) {

                }



                @Override

                public void onSearchStopped(int reason) {

                }



                @Override

                public void onSearchStopFailed(int reason) {

                }



                @Override

                public void onSourceFound(@NonNull BluetoothLeBroadcastMetadata source) {

                }



                @Override

                public void onSourceAdded(

                        @NonNull BluetoothDevice sink, int sourceId, int reason) {

                    Log.d(TAG, "onSourceAdded: dismiss stale dialog.");

                    if (mDeviceManager != null && mDialogHandler != null) {

                        CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(sink);

                        if (cachedDevice != null) {

                            mDialogHandler.closeOpeningDialogsForLeaDevice(cachedDevice);

                        }

                    }

                }



                @Override

                public void onSourceAddFailed(

                        @NonNull BluetoothDevice sink,

                        @NonNull BluetoothLeBroadcastMetadata source,

                        int reason) {

                }



                @Override

                public void onSourceModified(

                        @NonNull BluetoothDevice sink, int sourceId, int reason) {

                }



                @Override

                public void onSourceModifyFailed(

                        @NonNull BluetoothDevice sink, int sourceId, int reason) {

                }



                @Override

                public void onSourceRemoved(

                        @NonNull BluetoothDevice sink, int sourceId, int reason) {

                }



                @Override

                public void onSourceRemoveFailed(

                        @NonNull BluetoothDevice sink, int sourceId, int reason) {

                }



                @Override

                public void onReceiveStateChanged(

                        @NonNull BluetoothDevice sink,

                        int sourceId,

                        @NonNull BluetoothLeBroadcastReceiveState state) {

                }

            };



    public AudioSharingJoinHandlerController(@NonNull Context context,

            @NonNull String preferenceKey) {

        super(context, preferenceKey);

        mBtManager = Utils.getLocalBtManager(mContext);

        mEventManager = mBtManager == null ? null : mBtManager.getEventManager();

        mDeviceManager = mBtManager == null ? null : mBtManager.getCachedDeviceManager();

        mAssistant = mBtManager == null ? null

                : mBtManager.getProfileManager().getLeAudioBroadcastAssistantProfile();

        mExecutor = Executors.newSingleThreadExecutor();

    }



    /**

     * Initialize the controller.

     *

     * @param fragment The fragment to provide the context and metrics category for {@link

     *                 AudioSharingBluetoothDeviceUpdater} and provide the host for dialogs.

     */

    public void init(@NonNull DashboardFragment fragment) {

        mFragment = fragment;

        mDialogHandler = new AudioSharingDialogHandler(mContext, fragment);

    }



    @Override

    public void onStart(@NonNull LifecycleOwner owner) {

        var unused = ThreadUtils.postOnBackgroundThread(() -> {

            if (!isAvailable()) {

                Log.d(TAG, "Skip onStart(), feature is not supported.");

                return;

            }

            if (mEventManager == null || mDialogHandler == null || mAssistant == null) {

                Log.d(TAG, "Skip onStart(), profile is not ready.");

                return;

            }

            Log.d(TAG, "onStart() Register callbacks.");

            mEventManager.registerCallback(this);

            mAssistant.registerServiceCallBack(mExecutor, mAssistantCallback);

            mDialogHandler.registerCallbacks(mExecutor);

        });

    }



    @Override

    public void onStop(@NonNull LifecycleOwner owner) {

        var unused = ThreadUtils.postOnBackgroundThread(() -> {

            if (!isAvailable()) {

                Log.d(TAG, "Skip onStop(), feature is not supported.");

                return;

            }

            if (mEventManager == null || mDialogHandler == null || mAssistant == null) {

                Log.d(TAG, "Skip onStop(), profile is not ready.");

                return;

            }

            Log.d(TAG, "onStop() Unregister callbacks.");

            mEventManager.unregisterCallback(this);

            mAssistant.unregisterServiceCallBack(mAssistantCallback);

            mDialogHandler.unregisterCallbacks();

        });

    }





    @Override

    public int getAvailabilityStatus() {

        return (Flags.promoteAudioSharingForSecondAutoConnectedLeaDevice()
@@ -52,4 +210,65 @@ public class AudioSharingJoinHandlerController extends BasePreferenceController 
    public int getSliceHighlightMenuRes() {

        return 0;

    }



    @Override

    public void displayPreference(@NonNull PreferenceScreen screen) {

        super.displayPreference(screen);

        if (mFragment == null

                || mFragment.getActivity() == null

                || mFragment.getActivity().getIntent() == null) {

            Log.d(TAG, "Skip handleDeviceConnectedFromIntent, fragment intent is null");

            return;

        }

        Intent intent = mFragment.getActivity().getIntent();

        var unused =

                ThreadUtils.postOnBackgroundThread(() -> handleDeviceConnectedFromIntent(intent));

    }



    @Override

    public void onProfileConnectionStateChanged(

            @NonNull CachedBluetoothDevice cachedDevice,

            @ConnectionState int state,

            int bluetoothProfile) {

        if (mDialogHandler == null || mFragment == null) {

            Log.d(TAG, "Ignore onProfileConnectionStateChanged, not init correctly");

            return;

        }

        // Close related dialogs if the BT remote device is disconnected.

        if (state == BluetoothAdapter.STATE_DISCONNECTED) {

            boolean isLeAudioSupported = BluetoothUtils.isLeAudioSupported(cachedDevice);

            if (isLeAudioSupported

                    && bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT) {

                mDialogHandler.closeOpeningDialogsForLeaDevice(cachedDevice);

            } else if (!isLeAudioSupported && !cachedDevice.isConnected()) {

                mDialogHandler.closeOpeningDialogsForNonLeaDevice(cachedDevice);

            }

        }

    }



    /** Handle just connected device via intent. */

    @WorkerThread

    public void handleDeviceConnectedFromIntent(@NonNull Intent intent) {

        BluetoothDevice device = intent.getParcelableExtra(EXTRA_BLUETOOTH_DEVICE,

                BluetoothDevice.class);

        CachedBluetoothDevice cachedDevice =

                (device == null || mDeviceManager == null)

                        ? null

                        : mDeviceManager.findDevice(device);

        if (cachedDevice == null) {

            Log.d(TAG, "Skip handleDeviceConnectedFromIntent, device is null");

            return;

        }

        if (mDialogHandler == null) {

            Log.d(TAG, "Skip handleDeviceConnectedFromIntent, handler is null");

            return;

        }

        Log.d(TAG, "handleDeviceConnectedFromIntent, device = " + device.getAnonymizedAddress());

        mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ false);

    }



    @VisibleForTesting

    void setDialogHandler(@Nullable AudioSharingDialogHandler dialogHandler) {

        mDialogHandler = dialogHandler;

    }

}

src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerDashboardFragment.java

+8 −1
Original line number Diff line number Diff line
@@ -18,12 +18,16 @@ package com.android.settings.connecteddevice.audiosharing; 


import android.content.Context;



import androidx.annotation.Nullable;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;



public class AudioSharingJoinHandlerDashboardFragment extends DashboardFragment {

    private static final String TAG = "AudioSharingJoinHandlerFrag";



    @Nullable private AudioSharingJoinHandlerController mController;



    @Override

    public int getMetricsCategory() {

        // TODO: use real enum
@@ -43,6 +47,9 @@ public class AudioSharingJoinHandlerDashboardFragment extends DashboardFragment 
    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        use(AudioSharingJoinHandlerController.class);

        mController = use(AudioSharingJoinHandlerController.class);

        if (mController != null) {

            mController.init(this);

        }

    }

}

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerActivityTest.java

+40 −0
Original line number Diff line number Diff line
@@ -18,7 +18,19 @@ package com.android.settings.connecteddevice.audiosharing; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothStatusCodes;

import android.os.Bundle;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;



import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;

import com.android.settingslib.flags.Flags;



import org.junit.Before;

import org.junit.Rule;
@@ -28,17 +40,45 @@ import org.mockito.junit.MockitoJUnit; 
import org.mockito.junit.MockitoRule;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowBluetoothAdapter.class})

public class AudioSharingJoinHandlerActivityTest {

    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    private ShadowBluetoothAdapter mShadowBluetoothAdapter;

    private AudioSharingJoinHandlerActivity mActivity;



    @Before

    public void setUp() {

        mActivity = spy(Robolectric.buildActivity(AudioSharingJoinHandlerActivity.class).get());

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mShadowBluetoothAdapter.setEnabled(true);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(

                BluetoothStatusCodes.FEATURE_SUPPORTED);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(

                BluetoothStatusCodes.FEATURE_SUPPORTED);

    }



    @Test

    @DisableFlags(Flags.FLAG_PROMOTE_AUDIO_SHARING_FOR_SECOND_AUTO_CONNECTED_LEA_DEVICE)

    public void onCreate_flagOff_finish() {

        mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);

        mActivity.onCreate(new Bundle());

        verify(mActivity).finish();

    }



    @Test

    @EnableFlags({Flags.FLAG_ENABLE_LE_AUDIO_SHARING,

            Flags.FLAG_PROMOTE_AUDIO_SHARING_FOR_SECOND_AUTO_CONNECTED_LEA_DEVICE})

    public void onCreate_flagOn_create() {

        mActivity.onCreate(new Bundle());

        verify(mActivity, never()).finish();

    }



    @Test

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerControllerTest.java

+233 −1

File changed.

Preview size limit exceeded, changes collapsed.