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

Commit 9589041e authored by Yanting Yang's avatar Yanting Yang
Browse files

Add bond state checking into BluetoothDevicesSlice 

Make the Bluetooth device connected checking to be consistent with
BluetoothDeviceUpdater. Because it's more safe to check the bond state
and connected state together to handle abnoraml status from Bluetooth.

Fixes: 147351883
Test: visual, robotests
Change-Id: I4e34b73f16b44972fbb7273a5e13be1f3096835e
parent 69a7e054

src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.homepage.contextualcards.slices; 
import android.app.PendingIntent;

import android.app.settings.SettingsEnums;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.content.Intent;

import android.graphics.drawable.Drawable;
@@ -184,7 +185,8 @@ public class BluetoothDevicesSlice implements CustomSliceable { 


        // Get all connected devices and sort them.

        return cachedDevices.stream()

                .filter(device -> device.getDevice().isConnected())

                .filter(device -> device.getDevice().getBondState() == BluetoothDevice.BOND_BONDED

                        && device.getDevice().isConnected())

                .sorted(COMPARATOR).collect(Collectors.toList());

    }