Merge "[Audiosharing] Clean up dup codes" into main (ec282ed6) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.util.Log;
		import androidx.preference.Preference;

		import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
		import com.android.settingslib.bluetooth.BluetoothUtils;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		@@ -77,7 +76,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
		// It would show in Available Devices group if the audio sharing flag is disabled or
		// the device is not in the audio sharing session.
		if (cachedDevice.isConnectedLeAudioDevice()) {
		if (AudioSharingUtils.isFeatureEnabled()
		if (BluetoothUtils.isAudioSharingEnabled()
		&& BluetoothUtils.hasConnectedBroadcastSource(
		cachedDevice, mLocalBtManager)) {
		Log.d(

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import com.android.settings.bluetooth.BluetoothDevicePreference;
		import com.android.settings.bluetooth.BluetoothDeviceUpdater;
		import com.android.settings.bluetooth.Utils;
		import com.android.settings.connecteddevice.audiosharing.AudioSharingDialogHandler;
		import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.overlay.FeatureFactory;
		@@ -180,7 +179,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		super(context, KEY);
		mBtManager = Utils.getLocalBtManager(mContext);
		mExecutor = Executors.newSingleThreadExecutor();
		if (AudioSharingUtils.isFeatureEnabled()) {
		if (BluetoothUtils.isAudioSharingEnabled()) {
		mBroadcast =
		mBtManager == null
		? null
		@@ -201,7 +200,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		Log.d(TAG, "onStart() Bluetooth is not supported on this device");
		return;
		}
		if (AudioSharingUtils.isFeatureEnabled()) {
		if (BluetoothUtils.isAudioSharingEnabled()) {
		registerAudioSharingCallbacks();
		}
		mBtManager.getEventManager().registerCallback(this);
		@@ -217,7 +216,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		Log.d(TAG, "onStop() Bluetooth is not supported on this device");
		return;
		}
		if (AudioSharingUtils.isFeatureEnabled()) {
		if (BluetoothUtils.isAudioSharingEnabled()) {
		unregisterAudioSharingCallbacks();
		}
		if (mBluetoothDeviceUpdater != null) {
		@@ -279,7 +278,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		public void onDeviceClick(Preference preference) {
		final CachedBluetoothDevice cachedDevice =
		((BluetoothDevicePreference) preference).getBluetoothDevice();
		if (AudioSharingUtils.isFeatureEnabled() && mDialogHandler != null) {
		if (BluetoothUtils.isAudioSharingEnabled() && mDialogHandler != null) {
		mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);
		FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
		.action(mContext, SettingsEnums.ACTION_MEDIA_DEVICE_CLICK);
		@@ -295,7 +294,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		fragment.getContext(),
		AvailableMediaDeviceGroupController.this,
		fragment.getMetricsCategory());
		if (AudioSharingUtils.isFeatureEnabled()) {
		if (BluetoothUtils.isAudioSharingEnabled()) {
		mDialogHandler = new AudioSharingDialogHandler(mContext, fragment);
		}
		}
		@@ -342,8 +341,8 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		if (isAudioModeOngoingCall(mContext)) {
		// in phone call
		titleResId = R.string.connected_device_call_device_title;
		} else if (AudioSharingUtils.isFeatureEnabled()
		&& AudioSharingUtils.isBroadcasting(mBtManager)) {
		} else if (BluetoothUtils.isAudioSharingEnabled()
		&& BluetoothUtils.isBroadcasting(mBtManager)) {
		// without phone call, in audio sharing
		titleResId = R.string.audio_sharing_media_device_group_title;
		} else {

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,13 +28,13 @@ import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.Utils;
		import com.android.settings.connecteddevice.audiosharing.AudioSharingDevicePreferenceController;
		import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
		import com.android.settings.core.SettingsUIDeviceConfig;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.overlay.SurveyFeatureProvider;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.slices.SlicePreferenceController;
		import com.android.settingslib.bluetooth.BluetoothUtils;
		import com.android.settingslib.bluetooth.HearingAidStatsLogUtils;
		import com.android.settingslib.search.SearchIndexable;

		@@ -87,7 +87,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		+ ", action : "
		+ action);
		}
		if (AudioSharingUtils.isFeatureEnabled()) {
		if (BluetoothUtils.isAudioSharingEnabled()) {
		use(AudioSharingDevicePreferenceController.class).init(this);
		}
		use(AvailableMediaDeviceGroupController.class).init(this);

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,12 +19,13 @@ package com.android.settings.connecteddevice.audiosharing;
		import android.os.Bundle;

		import com.android.settings.SettingsActivity;
		import com.android.settingslib.bluetooth.BluetoothUtils;

		public class AudioSharingActivity extends SettingsActivity {
		@Override
		protected void onCreate(Bundle savedState) {
		super.onCreate(savedState);
		if (!AudioSharingUtils.isFeatureEnabled()) {
		if (!BluetoothUtils.isAudioSharingEnabled()) {
		finish();
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import androidx.preference.PreferenceScreen;

		import com.android.settings.bluetooth.Utils;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settingslib.bluetooth.BluetoothUtils;
		import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
		@@ -54,7 +55,7 @@ public abstract class AudioSharingBasePreferenceController extends BasePreferenc

		@Override
		public int getAvailabilityStatus() {
		return AudioSharingUtils.isFeatureEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override