From 42f3dfe672844652e112785d3311f19e9daf8b82 Mon Sep 17 00:00:00 2001
From: Ash_Chen <ashchen@google.com>
Date: Fri, 31 Aug 2018 21:28:57 +0800
Subject: [PATCH] Filter out the connected device in "Available devices"
 screen(1/2)

Don't add connected devices under "Available devices"

Bug: 113568981
Test: Bluetooth Pairing Test with some devices and accessories
Change-Id: I2cce35cd5c237ea90cf1c128e951816474c7a658
---
 .../settings/bluetooth/DeviceListPreferenceFragment.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index d4346373b59..385b5d9716c 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -261,10 +261,12 @@ public abstract class DeviceListPreferenceFragment extends
         cacheRemoveAllPrefs(preferenceGroup);
         preferenceGroup.setTitle(titleId);
         mDeviceListGroup = preferenceGroup;
-        setFilter(filter);
         if (addCachedDevices) {
+            // Don't show bonded devices when screen turned back on
+            setFilter(BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
             addCachedDevices();
         }
+        setFilter(filter);
         preferenceGroup.setEnabled(true);
         removeCachedPrefs(preferenceGroup);
     }