diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java index 7fbd10025d607..cd3242a9f7c2d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java @@ -297,6 +297,9 @@ public class CachedBluetoothDeviceManager { mCachedDevices.remove(i); } } + + // To clear the SetMemberPair flag when the Bluetooth is turning off. + mOngoingSetMemberPair = null; } }