summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Łukasz Rymanowski <rlukasz@google.com> 2025-03-17 17:31:59 +0000
committer Łukasz Rymanowski (xWF) <rlukasz@google.com> 2025-03-22 17:22:17 -0700
commite247d455eabd896e650b7717810b0f473dc3c0f1 (patch)
tree7cb4074159e3055b9abd4ec6b1054383ae984c83
parentf3d34a19baec0c0e179de16631687036b72bb7db (diff)
flag: Remove adm_verify_active_fallback_device flag
Flag has been delivered Bug: 369799111 Test: mmm packages/modules/Bluetooth Flag: EXEMPT, flag cleanup Change-Id: I31e7504570fbf01dd1f8a988353ffd7f5a7a041f
-rw-r--r--android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java14
-rw-r--r--android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java2
-rw-r--r--flags/active_device_manager.aconfig10
3 files changed, 6 insertions, 20 deletions
diff --git a/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java b/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
index 61429c8d90..46fda180fa 100644
--- a/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
+++ b/android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
@@ -417,7 +417,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac
final LeAudioService leAudioService = mFactory.getLeAudioService();
setA2dpActiveDevice(null, true);
setHfpActiveDevice(null);
- if (Flags.admVerifyActiveFallbackDevice() && leAudioService != null) {
+ if (leAudioService != null) {
setLeAudioActiveDevice(
null, !leAudioService.getActiveDevices().contains(device));
} else {
@@ -1162,13 +1162,11 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac
* recently removed device, it means it just switched profile it is using and is
* not new one.
*/
- boolean hasFallbackDevice = true;
- if (Flags.admVerifyActiveFallbackDevice()) {
- hasFallbackDevice =
- !(recentlyRemovedDevice != null
- && device.equals(recentlyRemovedDevice)
- && connectedHearingAidDevices.size() == 1);
- }
+ boolean hasFallbackDevice =
+ !(recentlyRemovedDevice != null
+ && device.equals(recentlyRemovedDevice)
+ && connectedHearingAidDevices.size() == 1);
+
if (mHearingAidConnectedDevices.contains(device)) {
Log.d(TAG, "Found a hearing aid fallback device: " + device);
setHearingAidActiveDevice(device);
diff --git a/android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java b/android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java
index 2af03df4ae..e4f6d08fbe 100644
--- a/android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java
+++ b/android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java
@@ -1387,7 +1387,6 @@ public class ActiveDeviceManagerTest {
* and selected as active. First LE Audio device disconnects with fallback to new one.
*/
@Test
- @EnableFlags(Flags.FLAG_ADM_VERIFY_ACTIVE_FALLBACK_DEVICE)
public void sameDeviceAsAshaAndLeAudio_noFallbackOnSwitch() {
/* Dual mode ASHA/LeAudio device from group 1 */
when(mLeAudioService.getGroupId(mHearingAidDevice)).thenReturn(1);
@@ -1425,7 +1424,6 @@ public class ActiveDeviceManagerTest {
* and selected as active. First ASHA device disconnects with fallback to new one.
*/
@Test
- @EnableFlags(Flags.FLAG_ADM_VERIFY_ACTIVE_FALLBACK_DEVICE)
public void sameDeviceAsLeAudioAndAsha_noFallbackOnSwitch() {
// Turn on the dual mode audio flag so the A2DP won't disconnect LE Audio
when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);
diff --git a/flags/active_device_manager.aconfig b/flags/active_device_manager.aconfig
index b2438be452..ebaf40fdb9 100644
--- a/flags/active_device_manager.aconfig
+++ b/flags/active_device_manager.aconfig
@@ -2,16 +2,6 @@ package: "com.android.bluetooth.flags"
container: "com.android.bt"
flag {
- name: "adm_verify_active_fallback_device"
- namespace: "bluetooth"
- description: "Verify if device selected for fallback is different then last one"
- bug: "369799111"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
name: "adm_fix_disconnect_of_set_member"
namespace: "bluetooth"
description: "Fix disconnecting of the set member device. Make sure the other set member is not considered as fallback device."