diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index 89759b7672c..d64bcbb6c2c 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice; import static com.android.settingslib.Utils.isAudioModeOngoingCall; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothLeBroadcast; import android.bluetooth.BluetoothLeBroadcastAssistant; import android.bluetooth.BluetoothLeBroadcastMetadata; import android.bluetooth.BluetoothLeBroadcastReceiveState; @@ -49,8 +50,10 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -61,17 +64,54 @@ import java.util.concurrent.Executors; */ public class AvailableMediaDeviceGroupController extends BasePreferenceController implements DefaultLifecycleObserver, DevicePreferenceCallback, BluetoothCallback { - private static final boolean DEBUG = BluetoothUtils.D; - private static final String TAG = "AvailableMediaDeviceGroupController"; private static final String KEY = "available_device_list"; private final Executor mExecutor; - @VisibleForTesting @Nullable LocalBluetoothManager mLocalBluetoothManager; + @VisibleForTesting @Nullable LocalBluetoothManager mBtManager; @VisibleForTesting @Nullable PreferenceGroup mPreferenceGroup; + @Nullable private LocalBluetoothLeBroadcast mBroadcast; + @Nullable private LocalBluetoothLeBroadcastAssistant mAssistant; @Nullable private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Nullable private FragmentManager mFragmentManager; @Nullable private AudioSharingDialogHandler mDialogHandler; + private BluetoothLeBroadcast.Callback mBroadcastCallback = + new BluetoothLeBroadcast.Callback() { + @Override + public void onBroadcastMetadataChanged( + int broadcastId, BluetoothLeBroadcastMetadata metadata) {} + + @Override + public void onBroadcastStartFailed(int reason) {} + + @Override + public void onBroadcastStarted(int reason, int broadcastId) { + Log.d(TAG, "onBroadcastStarted: update title."); + updateTitle(); + } + + @Override + public void onBroadcastStopFailed(int reason) {} + + @Override + public void onBroadcastStopped(int reason, int broadcastId) { + Log.d(TAG, "onBroadcastStopped: update title."); + updateTitle(); + } + + @Override + public void onBroadcastUpdateFailed(int reason, int broadcastId) {} + + @Override + public void onBroadcastUpdated(int reason, int broadcastId) {} + + @Override + public void onPlaybackStarted(int reason, int broadcastId) {} + + @Override + public void onPlaybackStopped(int reason, int broadcastId) {} + }; + private BluetoothLeBroadcastAssistant.Callback mAssistantCallback = new BluetoothLeBroadcastAssistant.Callback() { @Override @@ -136,32 +176,33 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle public AvailableMediaDeviceGroupController(Context context) { super(context, KEY); - mLocalBluetoothManager = Utils.getLocalBtManager(mContext); + mBtManager = Utils.getLocalBtManager(mContext); mExecutor = Executors.newSingleThreadExecutor(); + if (AudioSharingUtils.isFeatureEnabled()) { + mBroadcast = + mBtManager == null + ? null + : mBtManager.getProfileManager().getLeAudioBroadcastProfile(); + mAssistant = + mBtManager == null + ? null + : mBtManager.getProfileManager().getLeAudioBroadcastAssistantProfile(); + } } @Override public void onStart(@NonNull LifecycleOwner owner) { - if (mLocalBluetoothManager == null) { - Log.e(TAG, "onStart() Bluetooth is not supported on this device"); + if (isAvailable()) { + updateTitle(); + } + if (mBtManager == null) { + Log.d(TAG, "onStart() Bluetooth is not supported on this device"); return; } if (AudioSharingUtils.isFeatureEnabled()) { - LocalBluetoothLeBroadcastAssistant assistant = - mLocalBluetoothManager - .getProfileManager() - .getLeAudioBroadcastAssistantProfile(); - if (assistant != null) { - if (DEBUG) { - Log.d(TAG, "onStart() Register callbacks for assistant."); - } - assistant.registerServiceCallBack(mExecutor, mAssistantCallback); - } - if (mDialogHandler != null) { - mDialogHandler.registerCallbacks(mExecutor); - } + registerAudioSharingCallbacks(); } - mLocalBluetoothManager.getEventManager().registerCallback(this); + mBtManager.getEventManager().registerCallback(this); if (mBluetoothDeviceUpdater != null) { mBluetoothDeviceUpdater.registerCallback(); mBluetoothDeviceUpdater.refreshPreference(); @@ -170,29 +211,17 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle @Override public void onStop(@NonNull LifecycleOwner owner) { - if (mLocalBluetoothManager == null) { - Log.e(TAG, "onStop() Bluetooth is not supported on this device"); + if (mBtManager == null) { + Log.d(TAG, "onStop() Bluetooth is not supported on this device"); return; } if (AudioSharingUtils.isFeatureEnabled()) { - LocalBluetoothLeBroadcastAssistant assistant = - mLocalBluetoothManager - .getProfileManager() - .getLeAudioBroadcastAssistantProfile(); - if (assistant != null) { - if (DEBUG) { - Log.d(TAG, "onStop() Register callbacks for assistant."); - } - assistant.unregisterServiceCallBack(mAssistantCallback); - } - if (mDialogHandler != null) { - mDialogHandler.unregisterCallbacks(); - } + unregisterAudioSharingCallbacks(); } if (mBluetoothDeviceUpdater != null) { mBluetoothDeviceUpdater.unregisterCallback(); } - mLocalBluetoothManager.getEventManager().unregisterCallback(this); + mBtManager.getEventManager().unregisterCallback(this); } @Override @@ -205,7 +234,6 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle } if (isAvailable()) { - updateTitle(); if (mBluetoothDeviceUpdater != null) { mBluetoothDeviceUpdater.setPrefContext(screen.getContext()); mBluetoothDeviceUpdater.forceUpdate(); @@ -302,16 +330,53 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle } private void updateTitle() { - if (mPreferenceGroup != null) { - if (isAudioModeOngoingCall(mContext)) { - // in phone call - mPreferenceGroup.setTitle( - mContext.getString(R.string.connected_device_call_device_title)); - } else { - // without phone call - mPreferenceGroup.setTitle( - mContext.getString(R.string.connected_device_media_device_title)); - } + if (mPreferenceGroup == null) return; + var unused = + ThreadUtils.postOnBackgroundThread( + () -> { + int titleResId; + if (isAudioModeOngoingCall(mContext)) { + // in phone call + titleResId = R.string.connected_device_call_device_title; + } else if (AudioSharingUtils.isFeatureEnabled() + && AudioSharingUtils.isBroadcasting(mBtManager)) { + // without phone call, in audio sharing + titleResId = R.string.audio_sharing_media_device_group_title; + } else { + // without phone call, not audio sharing + titleResId = R.string.connected_device_media_device_title; + } + mContext.getMainExecutor() + .execute( + () -> { + if (mPreferenceGroup != null) { + mPreferenceGroup.setTitle(titleResId); + } + }); + }); + } + + private void registerAudioSharingCallbacks() { + if (mBroadcast != null) { + mBroadcast.registerServiceCallBack(mExecutor, mBroadcastCallback); + } + if (mAssistant != null) { + mAssistant.registerServiceCallBack(mExecutor, mAssistantCallback); + } + if (mDialogHandler != null) { + mDialogHandler.registerCallbacks(mExecutor); + } + } + + private void unregisterAudioSharingCallbacks() { + if (mBroadcast != null) { + mBroadcast.unregisterServiceCallBack(mBroadcastCallback); + } + if (mAssistant != null) { + mAssistant.unregisterServiceCallBack(mAssistantCallback); + } + if (mDialogHandler != null) { + mDialogHandler.unregisterCallbacks(); } } } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index 211817a368f..ab95c2c1180 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -22,16 +22,17 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.robolectric.Shadows.shadowOf; import static org.robolectric.shadows.ShadowLooper.shadowMainLooper; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothLeBroadcast; import android.bluetooth.BluetoothLeBroadcastAssistant; import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothStatusCodes; @@ -39,11 +40,13 @@ import android.content.Context; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.media.AudioManager; +import android.os.Looper; import android.platform.test.flag.junit.SetFlagsRule; import android.util.Pair; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; @@ -64,6 +67,7 @@ import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HearingAidInfo; +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; @@ -114,6 +118,7 @@ public class AvailableMediaDeviceGroupControllerTest { @Mock private LocalBluetoothManager mLocalBluetoothManager; @Mock private LocalBluetoothProfileManager mLocalBtProfileManager; @Mock private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock private LocalBluetoothLeBroadcast mBroadcast; @Mock private LocalBluetoothLeBroadcastAssistant mAssistant; @Mock private CachedBluetoothDevice mCachedBluetoothDevice; @Mock private BluetoothDevice mDevice; @@ -122,6 +127,7 @@ public class AvailableMediaDeviceGroupControllerTest { private PreferenceGroup mPreferenceGroup; private Context mContext; + private FragmentManager mFragManager; private Preference mPreference; private AvailableMediaDeviceGroupController mAvailableMediaDeviceGroupController; private AudioManager mAudioManager; @@ -137,7 +143,8 @@ public class AvailableMediaDeviceGroupControllerTest { mPreference = new Preference(mContext); mPreference.setKey(PREFERENCE_KEY_1); mPreferenceGroup = spy(new PreferenceScreen(mContext, null)); - final FragmentActivity mActivity = Robolectric.setupActivity(FragmentActivity.class); + mFragManager = + Robolectric.setupActivity(FragmentActivity.class).getSupportFragmentManager(); when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager); doReturn(mPackageManager).when(mContext).getPackageManager(); doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH); @@ -163,8 +170,7 @@ public class AvailableMediaDeviceGroupControllerTest { mAvailableMediaDeviceGroupController.setBluetoothDeviceUpdater( mAvailableMediaBluetoothDeviceUpdater); mAvailableMediaDeviceGroupController.setDialogHandler(mDialogHandler); - mAvailableMediaDeviceGroupController.setFragmentManager( - mActivity.getSupportFragmentManager()); + mAvailableMediaDeviceGroupController.setFragmentManager(mFragManager); mAvailableMediaDeviceGroupController.mPreferenceGroup = mPreferenceGroup; } @@ -208,14 +214,19 @@ public class AvailableMediaDeviceGroupControllerTest { } @Test - public void testRegister_audioSharingOff() { + public void testRegister_audioSharingFlagOff() { mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); + setUpBroadcast(); // register the callback in onStart() mAvailableMediaDeviceGroupController.onStart(mLifecycleOwner); + shadowOf(Looper.getMainLooper()).idle(); verify(mAvailableMediaBluetoothDeviceUpdater).registerCallback(); verify(mEventManager).registerCallback(any(BluetoothCallback.class)); verify(mAvailableMediaBluetoothDeviceUpdater).refreshPreference(); + verify(mBroadcast, times(0)) + .registerServiceCallBack( + any(Executor.class), any(BluetoothLeBroadcast.Callback.class)); verify(mAssistant, times(0)) .registerServiceCallBack( any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class)); @@ -223,14 +234,19 @@ public class AvailableMediaDeviceGroupControllerTest { } @Test - public void testRegister_audioSharingOn() { + public void testRegister_audioSharingFlagOn() { mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); setUpBroadcast(); // register the callback in onStart() mAvailableMediaDeviceGroupController.onStart(mLifecycleOwner); + shadowOf(Looper.getMainLooper()).idle(); + verify(mAvailableMediaBluetoothDeviceUpdater).registerCallback(); verify(mEventManager).registerCallback(any(BluetoothCallback.class)); verify(mAvailableMediaBluetoothDeviceUpdater).refreshPreference(); + verify(mBroadcast) + .registerServiceCallBack( + any(Executor.class), any(BluetoothLeBroadcast.Callback.class)); verify(mAssistant) .registerServiceCallBack( any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class)); @@ -238,25 +254,29 @@ public class AvailableMediaDeviceGroupControllerTest { } @Test - public void testUnregister_audioSharingOff() { + public void testUnregister_audioSharingFlagOff() { mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); + setUpBroadcast(); // unregister the callback in onStop() mAvailableMediaDeviceGroupController.onStop(mLifecycleOwner); verify(mAvailableMediaBluetoothDeviceUpdater).unregisterCallback(); verify(mEventManager).unregisterCallback(any(BluetoothCallback.class)); + verify(mBroadcast, times(0)) + .unregisterServiceCallBack(any(BluetoothLeBroadcast.Callback.class)); verify(mAssistant, times(0)) .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class)); verify(mDialogHandler, times(0)).unregisterCallbacks(); } @Test - public void testUnregister_audioSharingOn() { + public void testUnregister_audioSharingFlagOn() { mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); setUpBroadcast(); // unregister the callback in onStop() mAvailableMediaDeviceGroupController.onStop(mLifecycleOwner); verify(mAvailableMediaBluetoothDeviceUpdater).unregisterCallback(); verify(mEventManager).unregisterCallback(any(BluetoothCallback.class)); + verify(mBroadcast).unregisterServiceCallBack(any(BluetoothLeBroadcast.Callback.class)); verify(mAssistant) .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class)); verify(mDialogHandler).unregisterCallbacks(); @@ -280,25 +300,59 @@ public class AvailableMediaDeviceGroupControllerTest { @Test public void setTitle_inCallState_showCallStateTitle() { + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); + setUpBroadcast(); mAudioManager.setMode(AudioManager.MODE_IN_CALL); + when(mBroadcast.isEnabled(null)).thenReturn(true); mAvailableMediaDeviceGroupController.onAudioModeChanged(); + shadowOf(Looper.getMainLooper()).idle(); - assertThat(mPreferenceGroup.getTitle()) - .isEqualTo(mContext.getText(R.string.connected_device_call_device_title)); + assertThat(mPreferenceGroup.getTitle().toString()) + .isEqualTo(mContext.getString(R.string.connected_device_call_device_title)); } @Test - public void setTitle_notInCallState_showMediaStateTitle() { + public void setTitle_notInCallState_notInAudioSharing_showMediaStateTitle() { + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); + setUpBroadcast(); mAudioManager.setMode(AudioManager.MODE_NORMAL); + when(mBroadcast.isEnabled(null)).thenReturn(false); mAvailableMediaDeviceGroupController.onAudioModeChanged(); + shadowOf(Looper.getMainLooper()).idle(); - assertThat(mPreferenceGroup.getTitle()) - .isEqualTo(mContext.getText(R.string.connected_device_media_device_title)); + assertThat(mPreferenceGroup.getTitle().toString()) + .isEqualTo(mContext.getString(R.string.connected_device_media_device_title)); + } + + @Test + public void setTitle_notInCallState_audioSharingFlagOff_showMediaStateTitle() { + mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); + setUpBroadcast(); + mAudioManager.setMode(AudioManager.MODE_NORMAL); + when(mBroadcast.isEnabled(null)).thenReturn(true); + mAvailableMediaDeviceGroupController.onAudioModeChanged(); + shadowOf(Looper.getMainLooper()).idle(); + + assertThat(mPreferenceGroup.getTitle().toString()) + .isEqualTo(mContext.getString(R.string.connected_device_media_device_title)); + } + + @Test + public void setTitle_notInCallState_inAudioSharing_showAudioSharingMediaStateTitle() { + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); + setUpBroadcast(); + mAudioManager.setMode(AudioManager.MODE_NORMAL); + when(mBroadcast.isEnabled(null)).thenReturn(true); + mAvailableMediaDeviceGroupController.onAudioModeChanged(); + shadowOf(Looper.getMainLooper()).idle(); + + assertThat(mPreferenceGroup.getTitle().toString()) + .isEqualTo(mContext.getString(R.string.audio_sharing_media_device_group_title)); } @Test public void onStart_localBluetoothManagerNull_shouldNotCrash() { - mAvailableMediaDeviceGroupController.mLocalBluetoothManager = null; + mAvailableMediaDeviceGroupController.mBtManager = null; // Shouldn't crash mAvailableMediaDeviceGroupController.onStart(mLifecycleOwner); @@ -306,7 +360,7 @@ public class AvailableMediaDeviceGroupControllerTest { @Test public void onStop_localBluetoothManagerNull_shouldNotCrash() { - mAvailableMediaDeviceGroupController.mLocalBluetoothManager = null; + mAvailableMediaDeviceGroupController.mBtManager = null; // Shouldn't crash mAvailableMediaDeviceGroupController.onStop(mLifecycleOwner); @@ -367,13 +421,14 @@ public class AvailableMediaDeviceGroupControllerTest { BluetoothStatusCodes.FEATURE_SUPPORTED); mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported( BluetoothStatusCodes.FEATURE_SUPPORTED); + when(mLocalBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast); when(mLocalBtProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(mAssistant); - doNothing() - .when(mAssistant) - .registerServiceCallBack( - any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class)); - doNothing() - .when(mAssistant) - .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class)); + mAvailableMediaDeviceGroupController = + spy(new AvailableMediaDeviceGroupController(mContext)); + mAvailableMediaDeviceGroupController.setBluetoothDeviceUpdater( + mAvailableMediaBluetoothDeviceUpdater); + mAvailableMediaDeviceGroupController.setDialogHandler(mDialogHandler); + mAvailableMediaDeviceGroupController.setFragmentManager(mFragManager); + mAvailableMediaDeviceGroupController.mPreferenceGroup = mPreferenceGroup; } }