Rename the flag of keep_bt_devices_cache_updated
Flag: com.android.server.telecom.flags.keep_bluetooth_devices_cache_updated
Bug: 382733425
Test: make
Change-Id: I0b2b75f5a2532aaba0e0f53a1e32bcb544e4638c
diff --git a/flags/telecom_bluetoothdevicemanager_flags.aconfig b/flags/telecom_bluetoothdevicemanager_flags.aconfig
index 9b1b53e..5dd5831 100644
--- a/flags/telecom_bluetoothdevicemanager_flags.aconfig
+++ b/flags/telecom_bluetoothdevicemanager_flags.aconfig
@@ -10,7 +10,7 @@
}
# OWNER=huiwang TARGET=25Q1
flag {
- name: "keep_bt_devices_cache_updated"
+ name: "keep_bluetooth_devices_cache_updated"
namespace: "telecom"
description: "Fix the devices cache issue of BluetoothDeviceManager"
bug: "380320985"
diff --git a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
index dbc858b..f4d6041 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
@@ -519,7 +519,7 @@
Log.i(this, "onDeviceConnected: Adding device with address: %s and devicetype=%s",
device, getDeviceTypeString(deviceType));
targetDeviceMap.put(device.getAddress(), device);
- if (!mFeatureFlags.keepBtDevicesCacheUpdated()
+ if (!mFeatureFlags.keepBluetoothDevicesCacheUpdated()
|| !mFeatureFlags.useRefactoredAudioRouteSwitching()) {
mBluetoothRouteManager.onDeviceAdded(device.getAddress());
}
@@ -554,7 +554,7 @@
Log.i(this, "onDeviceDisconnected: Removing device with address: %s, devicetype=%s",
device, getDeviceTypeString(deviceType));
targetDeviceMap.remove(device.getAddress());
- if (!mFeatureFlags.keepBtDevicesCacheUpdated()
+ if (!mFeatureFlags.keepBluetoothDevicesCacheUpdated()
|| !mFeatureFlags.useRefactoredAudioRouteSwitching()) {
mBluetoothRouteManager.onDeviceLost(device.getAddress());
}
diff --git a/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java b/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
index 679db67..1cea531 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
@@ -211,7 +211,7 @@
if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {
mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_DEVICE_ADDED,
audioRouteType, device);
- if (mFeatureFlags.keepBtDevicesCacheUpdated()) {
+ if (mFeatureFlags.keepBluetoothDevicesCacheUpdated()) {
mBluetoothDeviceManager.onDeviceConnected(device, deviceType);
}
} else {
@@ -222,7 +222,7 @@
if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {
mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_DEVICE_REMOVED,
audioRouteType, device);
- if (mFeatureFlags.keepBtDevicesCacheUpdated()) {
+ if (mFeatureFlags.keepBluetoothDevicesCacheUpdated()) {
mBluetoothDeviceManager.onDeviceDisconnected(device, deviceType);
}
} else {