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

Commit 4d16cb50 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

LeAudioService: Remove dead code 

With following change:

05250672 LeAudio: Add support for mute/unmute

There is no need for special PTS mute handling. It can be easly done by
moving volume slider.

Bug: 273276001
Tag: #feature
Test: atest BluetoothInstrumentationTests
Change-Id: I1b4981db448eeb0b73ff2ea97730b91e84f1d6ce
parent 6c8ad601

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+0 −45
Original line number Diff line number Diff line
@@ -194,8 +194,6 @@ public class LeAudioService extends ProfileService { 
            new LinkedHashMap<>();



    private BroadcastReceiver mBondStateChangedReceiver;

    private BroadcastReceiver mMuteStateChangedReceiver;

    private int mStoredRingerMode = -1;

    private Handler mHandler = new Handler(Looper.getMainLooper());

    private final AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback =

            new AudioManagerAudioDeviceCallback();
@@ -275,10 +273,6 @@ public class LeAudioService extends ProfileService { 
        filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);

        mBondStateChangedReceiver = new BondStateChangedReceiver();

        registerReceiver(mBondStateChangedReceiver, filter);

        filter = new IntentFilter();

        filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        mMuteStateChangedReceiver = new MuteStateChangedReceiver();

        registerReceiver(mMuteStateChangedReceiver, filter);



        mLeAudioCallbacks = new RemoteCallbackList<IBluetoothLeAudioCallback>();
@@ -397,9 +391,6 @@ public class LeAudioService extends ProfileService { 
        // Unregister broadcast receivers

        unregisterReceiver(mBondStateChangedReceiver);

        mBondStateChangedReceiver = null;

        unregisterReceiver(mMuteStateChangedReceiver);

        mMuteStateChangedReceiver = null;





        if (mBroadcastCallbacks != null) {

            mBroadcastCallbacks.kill();
@@ -2112,42 +2103,6 @@ public class LeAudioService extends ProfileService { 
        }

    }



    @VisibleForTesting

    synchronized boolean isSilentModeEnabled() {

        return mStoredRingerMode != AudioManager.RINGER_MODE_NORMAL;

    }



    private class MuteStateChangedReceiver extends BroadcastReceiver {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (!AudioManager.RINGER_MODE_CHANGED_ACTION.equals(intent.getAction())) {

                return;

            }



            final String action = intent.getAction();

            if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {

                if (!Utils.isPtsTestMode()) return;



                int ringerMode = intent.getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1);



                if (ringerMode < 0 || ringerMode == mStoredRingerMode) return;



                mStoredRingerMode = ringerMode;

                int activeGroupId = getActiveGroupId();

                if (activeGroupId == LE_AUDIO_GROUP_ID_INVALID) return;



                VolumeControlService service = mServiceFactory.getVolumeControlService();

                if (service == null) return;



                if (isSilentModeEnabled()) {

                    service.muteGroup(activeGroupId);

                } else {

                    service.unmuteGroup(activeGroupId);

                }

            }

        }

    }



    /**

     * Check whether can connect to a peer device.

     * The check considers a number of factors during the evaluation.