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

Commit 6bb71738 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing flag enable_cached_bluetooth_device_dedup" into main

parents e0d866d3 3e3ce28f

packages/SettingsLib/aconfig/settingslib.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -8,16 +8,6 @@ flag { 
    bug: "314812750"

}



flag {

    name: "enable_cached_bluetooth_device_dedup"

    namespace: "bluetooth"

    description: "Enable dedup in CachedBluetoothDevice"

    bug: "319197962"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

   name: "bluetooth_qs_tile_dialog_auto_on_toggle"

   namespace: "bluetooth"

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settingslib.bluetooth;



import static com.android.settingslib.flags.Flags.enableCachedBluetoothDeviceDedup;



import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothCsipSetCoordinator;
@@ -403,7 +401,7 @@ public class BluetoothEventManager { 
                cachedDevice = mDeviceManager.addDevice(device);

            }



            if (enableCachedBluetoothDeviceDedup() && bondState == BluetoothDevice.BOND_BONDED) {

            if (bondState == BluetoothDevice.BOND_BONDED) {

                mDeviceManager.removeDuplicateInstanceForIdentityAddress(device);

            }