Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip starting audio stream service by UI events when flag is on." into main

Browse Source
This commit is contained in:
Chelsea Hao
2025-03-11 23:27:38 -07:00
committed by Android (Google) Code Review
parent 24b6ba590a 9a4106f140
commit de3ec7e343
4 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
View File

@@ -40,6 +40,7 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
import com.android.settingslib.flags.Flags;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.LayoutPreference;
@@ -88,8 +89,10 @@ public class AudioStreamHeaderController extends BasePreferenceController
var localSourceState = getLocalSourceState(state);
if (localSourceState == STREAMING) {
updateSummary();
mAudioStreamsHelper.startMediaService(
mContext, mBroadcastId, mBroadcastName);
if (!Flags.audioStreamMediaServiceByReceiveState()) {
mAudioStreamsHelper.startMediaService(
mContext, mBroadcastId, mBroadcastName);
}
} else if (mHysteresisModeFixAvailable && localSourceState == PAUSED) {
// if source paused, only update the summary
updateSummary();

11
src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedState.java
View File

@@ -26,6 +26,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.flags.Flags;
class SourceAddedState extends AudioStreamStateHandler {
@VisibleForTesting
@@ -55,10 +56,12 @@ class SourceAddedState extends AudioStreamStateHandler {
if (cached != null) {
mAudioStreamsRepository.saveMetadata(context, cached);
}
helper.startMediaService(
context,
preference.getAudioStreamBroadcastId(),
String.valueOf(preference.getTitle()));
if (!Flags.audioStreamMediaServiceByReceiveState()) {
helper.startMediaService(
context,
preference.getAudioStreamBroadcastId(),
String.valueOf(preference.getTitle()));
}
mMetricsFeatureProvider.action(
preference.getContext(),
SettingsEnums.ACTION_AUDIO_STREAM_JOIN_SUCCEED,