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

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

Merge "[Audiosharing] Adopt fallback API when developer preview on" into main

parents 025fff5a 8af37b24
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -339,7 +339,9 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
        if (lead != null) {
            String addr = lead.getDevice().getAnonymizedAddress();
            Log.d(TAG, "Set call audio device: " + addr);
            if (Flags.adoptPrimaryGroupManagementApi() && !mIsAudioModeOngoingCall.get()) {
            if ((Flags.adoptPrimaryGroupManagementApi() || (Flags.audioSharingDeveloperOption()
                    && BluetoothUtils.getAudioSharingPreviewValue(mContentResolver)))
                    && !mIsAudioModeOngoingCall.get()) {
                LeAudioProfile leaProfile = mBtManager == null ? null
                        : mBtManager.getProfileManager().getLeAudioProfile();
                if (leaProfile != null) {
+4 −1
Original line number Diff line number Diff line
@@ -227,7 +227,10 @@ public class AudioSharingDialogHandler {
                            mLocalBtManager, groupedDevices, /* filterByInSharing= */ true);
            AudioSharingStopDialogFragment.DialogEventListener listener =
                    () -> {
                        if (Flags.adoptPrimaryGroupManagementApi() && mLocalBtManager != null) {
                        if (mLocalBtManager != null && (Flags.adoptPrimaryGroupManagementApi() || (
                                mContext != null && Flags.audioSharingDeveloperOption()
                                        && BluetoothUtils.getAudioSharingPreviewValue(
                                        mContext.getContentResolver())))) {
                            LeAudioProfile profile =
                                    mLocalBtManager.getProfileManager().getLeAudioProfile();
                            if (profile != null) {