commit 4d16cb503c2b1c3a2ca84b056eb244aa7a8d6ba0
author Łukasz Rymanowski <rlukasz@google.com> Thu Apr 06 11:55:02 2023 +0000
committer Łukasz Rymanowski <rlukasz@google.com> Thu Apr 06 12:25:25 2023 +0000
tree 82ffa347d1ccbf3c24ae175157bcebbe7be33a79
parent 6c8ad60113af74333cb798a095d340680f70f8c0

LeAudioService: Remove dead code

With following change:

0525067226 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

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

diff --git a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
index 11cbc6c..7c7a986 100644
--- a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
+++ b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
@@ -194,8 +194,6 @@
             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 @@
         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 @@
         // Unregister broadcast receivers
         unregisterReceiver(mBondStateChangedReceiver);
         mBondStateChangedReceiver = null;
-        unregisterReceiver(mMuteStateChangedReceiver);
-        mMuteStateChangedReceiver = null;
-
 
         if (mBroadcastCallbacks != null) {
             mBroadcastCallbacks.kill();
@@ -2112,42 +2103,6 @@
         }
     }
 
-    @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.