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

Commit df2bb5b9 authored by Hui Wang's avatar Hui Wang
Browse files

Keep the BT devices cache of BluetoothDeviceManager updated 

Flag: com.android.server.telecom.flags.keep_bt_devices_cache_updated
Bug: 380320985
Bug: 380323024
Test: manual
Change-Id: Ia8e8fb327dd18fef115f82af728e6085cbb17e79
parent 385a742f

flags/telecom_bluetoothdevicemanager_flags.aconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -8,3 +8,10 @@ flag { 
  description: "Fix for Log.wtf in the BinderProxy"

  description: "Fix for Log.wtf in the BinderProxy"

  bug: "333417369"

  bug: "333417369"

}

}

# OWNER=huiwang TARGET=25Q1

flag {

  name: "keep_bt_devices_cache_updated"

  namespace: "telecom"

  description: "Fix the devices cache issue of BluetoothDeviceManager"

  bug: "380320985"

}

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -519,10 +519,13 @@ public class BluetoothDeviceManager { 
                Log.i(this, "onDeviceConnected: Adding device with address: %s and devicetype=%s",

                Log.i(this, "onDeviceConnected: Adding device with address: %s and devicetype=%s",

                        device, getDeviceTypeString(deviceType));

                        device, getDeviceTypeString(deviceType));

                targetDeviceMap.put(device.getAddress(), device);

                targetDeviceMap.put(device.getAddress(), device);

                if (!mFeatureFlags.keepBtDevicesCacheUpdated()

                        || !mFeatureFlags.useRefactoredAudioRouteSwitching()) {

                    mBluetoothRouteManager.onDeviceAdded(device.getAddress());

                    mBluetoothRouteManager.onDeviceAdded(device.getAddress());

                }

                }

            }

            }

        }

        }

    }





    void clearDeviceFromDeviceMaps(String deviceAddress) {

    void clearDeviceFromDeviceMaps(String deviceAddress) {

        for (LinkedHashMap<String, BluetoothDevice> deviceMap : mDevicesByAddressMaps) {

        for (LinkedHashMap<String, BluetoothDevice> deviceMap : mDevicesByAddressMaps) {
@@ -551,10 +554,13 @@ public class BluetoothDeviceManager { 
                Log.i(this, "onDeviceDisconnected: Removing device with address: %s, devicetype=%s",

                Log.i(this, "onDeviceDisconnected: Removing device with address: %s, devicetype=%s",

                        device, getDeviceTypeString(deviceType));

                        device, getDeviceTypeString(deviceType));

                targetDeviceMap.remove(device.getAddress());

                targetDeviceMap.remove(device.getAddress());

                if (!mFeatureFlags.keepBtDevicesCacheUpdated()

                        || !mFeatureFlags.useRefactoredAudioRouteSwitching()) {

                    mBluetoothRouteManager.onDeviceLost(device.getAddress());

                    mBluetoothRouteManager.onDeviceLost(device.getAddress());

                }

                }

            }

            }

        }

        }

    }





    public void disconnectAudio() {

    public void disconnectAudio() {

        if (mFeatureFlags.callAudioCommunicationDeviceRefactor()) {

        if (mFeatureFlags.callAudioCommunicationDeviceRefactor()) {

src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,9 @@ public class BluetoothStateReceiver extends BroadcastReceiver { 
            if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {

            if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {

                mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_DEVICE_ADDED,

                mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_DEVICE_ADDED,

                        audioRouteType, device);

                        audioRouteType, device);

                if (mFeatureFlags.keepBtDevicesCacheUpdated()) {

                    mBluetoothDeviceManager.onDeviceConnected(device, deviceType);

                }

            } else {

            } else {

                mBluetoothDeviceManager.onDeviceConnected(device, deviceType);

                mBluetoothDeviceManager.onDeviceConnected(device, deviceType);

            }

            }
@@ -219,6 +222,9 @@ public class BluetoothStateReceiver extends BroadcastReceiver { 
            if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {

            if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {

                mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_DEVICE_REMOVED,

                mCallAudioRouteAdapter.sendMessageWithSessionInfo(BT_DEVICE_REMOVED,

                        audioRouteType, device);

                        audioRouteType, device);

                if (mFeatureFlags.keepBtDevicesCacheUpdated()) {

                    mBluetoothDeviceManager.onDeviceDisconnected(device, deviceType);

                }

            } else {

            } else {

                mBluetoothDeviceManager.onDeviceDisconnected(device, deviceType);

                mBluetoothDeviceManager.onDeviceDisconnected(device, deviceType);

            }

            }